Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-20 10:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix-autoindent-on-closing-paren

Browse Source
This commit is contained in:
Aiday Marlen Kyzy
2024-03-11 09:42:02 +01:00
committed by GitHub
parent bac1926029 c658210cce
commit 946d53e850
2077 changed files with 72547 additions and 32065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/typescript-basics/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": {
"name": "TypeScript-TmLanguage",
"repositoryUrl": "https://github.com/microsoft/TypeScript-TmLanguage",
"commitHash": "8c7482b94b548eab56da64dbfb30b82589b3f747"
"commitHash": "b80b7509a78e642f789c567e144ed951ab98b4e3"
}
},
"license": "MIT",

4
extensions/typescript-basics/language-configuration.json
View File

@@ -136,7 +136,7 @@
},
// e.g. * ...| or */| or *-----*/|
"unIndentedLinePattern": {
"pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$|^(\\t|[ ])*[ ]\\*/\\s*$|^(\\t|[ ])*[ ]\\*([ ]([^\\*]|\\*(?!/))*)?$"
"pattern": "^(\\t|[ ])*[ ]\\*[^/]*\\*/\\s*$|^(\\t|[ ])*[ ]\\*/\\s*$|^(\\t|[ ])*\\*([ ]([^\\*]|\\*(?!/))*)?$"
}
},
"onEnterRules": [
@@ -166,7 +166,7 @@
{
// e.g. * ...|
"beforeText": {
"pattern": "^(\\t|[ ])*[ ]\\*([ ]([^\\*]|\\*(?!/))*)?$"
"pattern": "^(\\t|[ ])*\\*([ ]([^\\*]|\\*(?!/))*)?$"
},
"previousLineText": {
"pattern": "(?=^(\\s*(/\\*\\*|\\*)).*)(?=(?!(\\s*\\*/)))"

1
extensions/typescript-basics/package.json
View File

@@ -12,6 +12,7 @@
"scripts": {
"update-grammar": "node ./build/update-grammars.mjs"
},
"categories": ["Programming Languages"],
"contributes": {
"languages": [
{

9
extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json
View File

@@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/8c7482b94b548eab56da64dbfb30b82589b3f747",
"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/b80b7509a78e642f789c567e144ed951ab98b4e3",
"name": "TypeScript",
"scopeName": "source.ts",
"patterns": [
@@ -2348,12 +2348,15 @@
]
},
"import-export-assert-clause": {
"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(assert)\\s*(\\{)",
"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(with)|(assert))\\s*(\\{)",
"beginCaptures": {
"1": {
"name": "keyword.control.assert.ts"
"name": "keyword.control.with.ts"
},
"2": {
"name": "keyword.control.assert.ts"
},
"3": {
"name": "punctuation.definition.block.ts"
}
},

9
extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
View File

@@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/8c7482b94b548eab56da64dbfb30b82589b3f747",
"version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/b80b7509a78e642f789c567e144ed951ab98b4e3",
"name": "TypeScriptReact",
"scopeName": "source.tsx",
"patterns": [
@@ -2351,12 +2351,15 @@
]
},
"import-export-assert-clause": {
"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(assert)\\s*(\\{)",
"begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(with)|(assert))\\s*(\\{)",
"beginCaptures": {
"1": {
"name": "keyword.control.assert.tsx"
"name": "keyword.control.with.tsx"
},
"2": {
"name": "keyword.control.assert.tsx"
},
"3": {
"name": "punctuation.definition.block.tsx"
}
},