Merge pull request #479 from CodinGame/update-vscode-1.92.1

Update vscode 1.92.1 and fix language packs
CodinGame · Aug 9, 2024 · 16b3124 · 16b3124 · github-actions · Aug 9, 2024
2 parents b5fd57b + 2c82b08
commit 16b3124
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -31,9 +31,9 @@
   },
   "config": {
     "vscode": {
-      "version": "1.92.0",
-      "ref": "1.92.0",
-      "commit": "b1c0a14de1414fcdaa400695b4db1c0799bc3124"
+      "version": "1.92.1",
+      "ref": "1.92.1",
+      "commit": "eaa41d57266683296de7d118f574d0c2652e1fc4"
     },
     "monaco": {
       "ref": "v0.50.0",

diff --git a/rollup/rollup.config.ts b/rollup/rollup.config.ts
@@ -157,7 +157,7 @@ function isCallPure (file: string, functionName: string, node: recast.types.name
 }
 
 const nlsKeys: [moduleId: string, keys: string[]][] = []
-let nlsIndex = -1
+let nlsIndex = 0
 
 function transformVSCodeCode (id: string, code: string) {
   const translationPath = nodePath.relative(id.startsWith(OVERRIDE_PATH) ? OVERRIDE_PATH : VSCODE_SRC_DIR, id)
@@ -224,13 +224,13 @@ function transformVSCodeCode (id: string, code: string) {
           throw new Error('Unable to extract translation key')
         }
 
-        if (!moduleNlsKeys.includes(localizationKey)) {
-          moduleNlsKeys.push(localizationKey)
-          nlsIndex++
+        let moduleNlsIndex = moduleNlsKeys.indexOf(localizationKey)
+        if (moduleNlsIndex === -1) {
+          moduleNlsIndex = moduleNlsKeys.push(localizationKey) - 1
         }
         path.replace(recast.types.builders.callExpression(
           path.node.callee,
-          [recast.types.builders.numericLiteral(nlsIndex), ...path.node.arguments.slice(1)]
+          [recast.types.builders.numericLiteral(nlsIndex + moduleNlsIndex), ...path.node.arguments.slice(1)]
         ))
         transformed = true
       } else if (node.callee.type === 'MemberExpression') {
@@ -318,6 +318,7 @@ function transformVSCodeCode (id: string, code: string) {
 
   if (moduleNlsKeys.length > 0) {
     nlsKeys.push([translationPath, moduleNlsKeys])
+    nlsIndex += moduleNlsKeys.length
   }
 
   return patchedCode

diff --git a/vscode-paches/0030-cleanup-remove-some-checks-and-warnings.patch b/vscode-paches/0030-cleanup-remove-some-checks-and-warnings.patch
@@ -25,10 +25,10 @@ index e5fa674ea82..c3e8d26f3da 100644
  	});
  }
 diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
-index 8870ddf4cc6..6bc4e3293c6 100644
+index e1efba3e802..8f87777ca82 100644
 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts
 +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
-@@ -492,11 +492,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
+@@ -488,11 +488,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
  				return;
  			}
 
@@ -40,7 +40,7 @@ index 8870ddf4cc6..6bc4e3293c6 100644
  			if (e.data.channel === 'webview-ready') {
  				if (this._messagePort) {
  					return;
-@@ -551,11 +546,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
+@@ -547,11 +542,6 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
  		return endpoint;
  	}
 

diff --git a/vscode-paches/0033-fix-use-asBrowserUri-to-get-iframe-src.patch b/vscode-paches/0033-fix-use-asBrowserUri-to-get-iframe-src.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] fix: use asBrowserUri to get iframe src
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
-index 6bc4e3293c6..b7a9e51144f 100644
+index 8f87777ca82..27e43963b86 100644
 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts
 +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
-@@ -448,7 +448,8 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
+@@ -444,7 +444,8 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
  		// Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1754872
  		const fileName = isFirefox ? 'index-no-csp.html' : 'index.html';
 

diff --git a/vscode-paches/0034-feat-add-some-parameter-to-webview-iframes.patch b/vscode-paches/0034-feat-add-some-parameter-to-webview-iframes.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] feat: add some parameter to webview iframes
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
-index b7a9e51144f..be42aaaeff3 100644
+index 27e43963b86..c1df248c2da 100644
 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts
 +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
 @@ -11,7 +11,7 @@ import { streamToBuffer, VSBufferReadableStream } from 'vs/base/common/buffer';
@@ -20,7 +20,7 @@ index b7a9e51144f..be42aaaeff3 100644
  import { URI } from 'vs/base/common/uri';
  import { generateUuid } from 'vs/base/common/uuid';
  import { localize } from 'vs/nls';
-@@ -441,6 +441,9 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
+@@ -437,6 +437,9 @@ export class WebviewElement extends Disposable implements IWebview, WebviewFindD
  			params.purpose = options.purpose;
  		}
 

diff --git a/vscode-paches/0053-fix-rollback-typescript-as-the-last-version-breaks-t.patch b/vscode-paches/0053-fix-rollback-typescript-as-the-last-version-breaks-t.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] fix: rollback typescript as the last version breaks the
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/package.json b/package.json
-index 7b51678c85a..999105643e3 100644
+index 70ca212fe5e..893de369e19 100644
 --- a/package.json
 +++ b/package.json
 @@ -208,7 +208,7 @@