From 647f8724320828c9ebf90ec6ec0db73b560cb332 Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Thu, 25 Mar 2021 23:46:37 +0100 Subject: [PATCH] Roll back to `vscode-textmate@5.2.0` --- package.json | 2 +- remote/package.json | 2 +- remote/web/package.json | 2 +- remote/web/yarn.lock | 8 ++++---- remote/yarn.lock | 8 ++++---- .../services/textMate/browser/abstractTextMateService.ts | 2 +- .../services/textMate/electron-sandbox/textMateWorker.ts | 2 +- yarn.lock | 8 ++++---- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index f56c9fe0d17..22bd01eb143 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "vscode-regexpp": "^3.1.0", "vscode-ripgrep": "^1.11.1", "vscode-sqlite3": "4.0.10", - "vscode-textmate": "5.3.1", + "vscode-textmate": "5.2.0", "xterm": "4.12.0-beta.3", "xterm-addon-search": "0.8.0", "xterm-addon-unicode11": "0.3.0-beta.3", diff --git a/remote/package.json b/remote/package.json index 8b20831e0ef..fd69fc737f5 100644 --- a/remote/package.json +++ b/remote/package.json @@ -21,7 +21,7 @@ "vscode-proxy-agent": "^0.8.1", "vscode-regexpp": "^3.1.0", "vscode-ripgrep": "^1.11.1", - "vscode-textmate": "5.3.1", + "vscode-textmate": "5.2.0", "xterm": "4.12.0-beta.3", "xterm-addon-search": "0.8.0", "xterm-addon-unicode11": "0.3.0-beta.3", diff --git a/remote/web/package.json b/remote/web/package.json index f21e3a7ea0e..362c0b4997d 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -7,7 +7,7 @@ "jschardet": "2.2.1", "tas-client-umd": "0.1.4", "vscode-oniguruma": "1.3.1", - "vscode-textmate": "5.3.1", + "vscode-textmate": "5.2.0", "xterm": "4.12.0-beta.3", "xterm-addon-search": "0.8.0", "xterm-addon-unicode11": "0.3.0-beta.3", diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index fe940574ed1..8377719ac17 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -22,10 +22,10 @@ vscode-oniguruma@1.3.1: resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.3.1.tgz#e2383879c3485b19f533ec34efea9d7a2b14be8f" integrity sha512-gz6ZBofA7UXafVA+m2Yt2zHKgXC2qedArprIsHAPKByTkwq9l5y/izAGckqxYml7mSbYxTRTfdRwsFq3cwF4LQ== -vscode-textmate@5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.3.1.tgz#7ce578a4841a1b114485388ef734cc9e23b45a02" - integrity sha512-X4E7iPJzmMsL9AY4MyZrxUt0Dm/kGWreJEGdQgAHXHQrRGDdlwAu9X1LCsQ0VKUCg5wjwSS1LPpy1BOfxIw4Tw== +vscode-textmate@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e" + integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ== xterm-addon-search@0.8.0: version "0.8.0" diff --git a/remote/yarn.lock b/remote/yarn.lock index 1b16d9c92c6..1999d9958c4 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -399,10 +399,10 @@ vscode-ripgrep@^1.11.1: https-proxy-agent "^4.0.0" proxy-from-env "^1.1.0" -vscode-textmate@5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.3.1.tgz#7ce578a4841a1b114485388ef734cc9e23b45a02" - integrity sha512-X4E7iPJzmMsL9AY4MyZrxUt0Dm/kGWreJEGdQgAHXHQrRGDdlwAu9X1LCsQ0VKUCg5wjwSS1LPpy1BOfxIw4Tw== +vscode-textmate@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e" + integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ== vscode-windows-ca-certs@0.3.0: version "0.3.0" diff --git a/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts b/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts index fd32104a505..c73fb058af1 100644 --- a/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts +++ b/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts @@ -234,7 +234,7 @@ export abstract class AbstractTextMateService extends Disposable implements ITex const [vscodeTextmate, vscodeOniguruma] = await Promise.all([import('vscode-textmate'), this._getVSCodeOniguruma()]); const onigLib: Promise = Promise.resolve({ - createOnigScanner: (sources: string[]) => vscodeOniguruma.createOnigScanner(sources), + createOnigScanner: (sources: string[]) => vscodeOniguruma.createOnigScanner(sources), createOnigString: (str: string) => vscodeOniguruma.createOnigString(str) }); diff --git a/src/vs/workbench/services/textMate/electron-sandbox/textMateWorker.ts b/src/vs/workbench/services/textMate/electron-sandbox/textMateWorker.ts index 4cad5a0eeb1..5b811274fbc 100644 --- a/src/vs/workbench/services/textMate/electron-sandbox/textMateWorker.ts +++ b/src/vs/workbench/services/textMate/electron-sandbox/textMateWorker.ts @@ -155,7 +155,7 @@ export class TextMateWorker { await vscodeOniguruma.loadWASM(bytes); const onigLib: Promise = Promise.resolve({ - createOnigScanner: (sources) => vscodeOniguruma.createOnigScanner(sources), + createOnigScanner: (sources) => vscodeOniguruma.createOnigScanner(sources), createOnigString: (str) => vscodeOniguruma.createOnigString(str) }); diff --git a/yarn.lock b/yarn.lock index 0f7f566baed..e3615ef81b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10135,10 +10135,10 @@ vscode-telemetry-extractor@^1.6.0: ts-morph "^3.1.3" vscode-ripgrep "^1.6.2" -vscode-textmate@5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.3.1.tgz#7ce578a4841a1b114485388ef734cc9e23b45a02" - integrity sha512-X4E7iPJzmMsL9AY4MyZrxUt0Dm/kGWreJEGdQgAHXHQrRGDdlwAu9X1LCsQ0VKUCg5wjwSS1LPpy1BOfxIw4Tw== +vscode-textmate@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e" + integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ== vscode-windows-ca-certs@^0.3.0: version "0.3.0"