Merge pull request #9595 from Microsoft/aeschli/languageconfiguration-cleanup

Replace deprecated __ language APIs with language-configuration alternative

extensions/typescript/language-configuration.json

@@ -0,0 +1,30 @@
+{
+	"comments": {
+		"lineComment": "//",
+		"blockComment": [ "/*", "*/" ]
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["<", ">"]
+	],
+	"autoClosingPairs": [
+		{ "open": "{", "close": "}" },
+		{ "open": "[", "close": "]" },
+		{ "open": "(", "close": ")" },
+		{ "open": "'", "close": "'", "notIn": ["string"] },
+		{ "open": "\"", "close": "\"", "notIn": ["string", "comment"] },
+		{ "open": "`", "close": "`", "notIn": ["string", "comment"] },
+		{ "open": "/**", "close": " */", "notIn": ["string"] }
+	],
+	"surroundingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["<", ">"],
+		["'", "'"],
+		["\"", "\""],
+		["`", "`"]
+	]
+}

extensions/typescript/package.json

@@ -37,7 +37,8 @@
 				],
 				"extensions": [
 					".ts"
-				]
+				],
+				"configuration": "./language-configuration.json"
 			},
 			{
 				"id": "typescriptreact",
@@ -47,7 +48,8 @@
 				],
 				"extensions": [
 					".tsx"
-				]
+				],
+				"configuration": "./language-configuration.json"
 			}
 		],
 		"grammars": [

extensions/typescript/src/typescriptMain.ts

@@ -168,15 +168,6 @@ class LanguageProvider {
 					increaseIndentPattern: /^.*\{[^}"']*$/
 				},
 				wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
-				comments: {
-					lineComment: '//',
-					blockComment: ['/*', '*/']
-				},
-				brackets: [
-					['{', '}'],
-					['[', ']'],
-					['(', ')'],
-				],
 				onEnterRules: [
 					{
 						// e.g. /** | */
@@ -204,22 +195,7 @@ class LanguageProvider {
 						beforeText: /^(\t|(\ \ ))*\ \*[^/]*\*\/\s*$/,
 						action: { indentAction: IndentAction.None, removeText: 1 }
 					}
-				],
-
-				__electricCharacterSupport: {
-					docComment: { scope: 'comment.documentation', open: '/**', lineStart: ' * ', close: ' */' }
-				},
-
-				__characterPairSupport: {
-					autoClosingPairs: [
-						{ open: '{', close: '}' },
-						{ open: '[', close: ']' },
-						{ open: '(', close: ')' },
-						{ open: '"', close: '"', notIn: ['string'] },
-						{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
-						{ open: '`', close: '`', notIn: ['string', 'comment'] }
-					]
-				}
+				]
 			});
 		});
 	}