Adopt latest `vscode-textmate` and register the Registry for disposal

package.json

@@ -59,7 +59,7 @@
     "vscode-proxy-agent": "^0.5.2",
     "vscode-ripgrep": "^1.5.8",
     "vscode-sqlite3": "4.0.10",
-    "vscode-textmate": "5.0.2",
+    "vscode-textmate": "5.1.1",
     "xterm": "4.6.0-beta.25",
     "xterm-addon-search": "0.6.0",
     "xterm-addon-unicode11": "0.2.0-beta.2",

remote/package.json

@@ -19,7 +19,7 @@
     "vscode-oniguruma": "1.3.0",
     "vscode-proxy-agent": "^0.5.2",
     "vscode-ripgrep": "^1.5.8",
-    "vscode-textmate": "5.0.2",
+    "vscode-textmate": "5.1.1",
     "xterm": "4.6.0-beta.25",
     "xterm-addon-search": "0.6.0",
     "xterm-addon-unicode11": "0.2.0-beta.2",

remote/web/package.json

@@ -4,7 +4,7 @@
 	"dependencies": {
 		"semver-umd": "^5.5.6",
 		"vscode-oniguruma": "1.3.0",
-		"vscode-textmate": "5.0.2",
+		"vscode-textmate": "5.1.1",
 		"xterm": "4.6.0-beta.25",
 		"xterm-addon-search": "0.6.0",
 		"xterm-addon-unicode11": "0.2.0-beta.2",

remote/web/yarn.lock

@@ -12,10 +12,10 @@ vscode-oniguruma@1.3.0:
   resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.3.0.tgz#6788a9db2f8b0781243b4eb8c7a1dd25f6c0e2c8"
   integrity sha512-m4Br19v6XD4MRbVrgsLNSZgQrBzk1BCMCleL8+GrcoGxKEJJd62zOFcTaoQR3hCrSlLqoxWmJ7Cc0VieVV3iTQ==
 
-vscode-textmate@5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.0.2.tgz#db661c4a9d7aae5923030b4e3d55cf88b7ece0dd"
-  integrity sha512-ZkaXGGXvxinC7bVJT67MOQLdmXE3p3xqUbkhy7tmBRlsHWPKh3MP1zA/+NeFlu4JAGzyuT1Y5MPn7s64szvMpQ==
+vscode-textmate@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.1.1.tgz#d88dbf271bee7cede455a21bd4894ba5724a4a7e"
+  integrity sha512-5VHjF+Fglf9d2JI5OyQ7FHutK6/29G0qYyD920K0SWO7uY8JTWbqyKAHEtfB/ZDk2fOe/E23n3wz9fHXKi63yg==
 
 xterm-addon-search@0.6.0:
   version "0.6.0"

remote/yarn.lock

@@ -387,10 +387,10 @@ vscode-ripgrep@^1.5.8:
   resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.8.tgz#32cb33da6d1a9ca8f5de8c2813ed5114fd55fc11"
   integrity sha512-l6Pv/t1Jk63RU+kEkMO04XxnNRYdyzuesizj9AzFpcfrUxxpAjEJBK1qO9Mov30UUGZl7uDUBn+uCv9koaHPPA==
 
-vscode-textmate@5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.0.2.tgz#db661c4a9d7aae5923030b4e3d55cf88b7ece0dd"
-  integrity sha512-ZkaXGGXvxinC7bVJT67MOQLdmXE3p3xqUbkhy7tmBRlsHWPKh3MP1zA/+NeFlu4JAGzyuT1Y5MPn7s64szvMpQ==
+vscode-textmate@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.1.1.tgz#d88dbf271bee7cede455a21bd4894ba5724a4a7e"
+  integrity sha512-5VHjF+Fglf9d2JI5OyQ7FHutK6/29G0qYyD920K0SWO7uY8JTWbqyKAHEtfB/ZDk2fOe/E23n3wz9fHXKi63yg==
 
 vscode-windows-ca-certs@0.2.0:
   version "0.2.0"

src/vs/workbench/services/textMate/common/TMGrammarFactory.ts

@@ -41,7 +41,7 @@ export class TMGrammarFactory extends Disposable {
 		this._injections = {};
 		this._injectedEmbeddedLanguages = {};
 		this._languageToScope2 = [];
-		this._grammarRegistry = new vscodeTextmate.Registry({
+		this._grammarRegistry = this._register(new vscodeTextmate.Registry({
 			onigLib: onigLib,
 			loadGrammar: async (scopeName: string) => {
 				const grammarDefinition = this._scopeRegistry.getGrammarDefinition(scopeName);
@@ -67,7 +67,7 @@ export class TMGrammarFactory extends Disposable {
 				}
 				return injections;
 			}
-		});
+		}));
 
 		for (const validGrammar of grammarDefinitions) {
 			this._scopeRegistry.register(validGrammar);

yarn.lock

@@ -9738,10 +9738,10 @@ vscode-sqlite3@4.0.10:
   dependencies:
     nan "^2.14.0"
 
-vscode-textmate@5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.0.2.tgz#db661c4a9d7aae5923030b4e3d55cf88b7ece0dd"
-  integrity sha512-ZkaXGGXvxinC7bVJT67MOQLdmXE3p3xqUbkhy7tmBRlsHWPKh3MP1zA/+NeFlu4JAGzyuT1Y5MPn7s64szvMpQ==
+vscode-textmate@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.1.1.tgz#d88dbf271bee7cede455a21bd4894ba5724a4a7e"
+  integrity sha512-5VHjF+Fglf9d2JI5OyQ7FHutK6/29G0qYyD920K0SWO7uY8JTWbqyKAHEtfB/ZDk2fOe/E23n3wz9fHXKi63yg==
 
 vscode-windows-ca-certs@0.2.0:
   version "0.2.0"