Alignment with 1.100.3 version of VS Code

.rebase/CHANGELOG.md

@@ -8,14 +8,6 @@ https://github.com/che-incubator/che-code/pull/549
 - code/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
 ---
 
-#### @RomanNikitenko
-https://github.com/che-incubator/che-code/pull/546
-
-- code/package.json 
-- code/build/package.json
-- code/remote/package.json
----
-
 #### @RomanNikitenko
 https://github.com/che-incubator/che-code/pull/545
 
@@ -25,13 +17,11 @@ https://github.com/che-incubator/che-code/pull/545
 #### @RomanNikitenko
 https://github.com/che-incubator/che-code/pull/540 \
 https://github.com/RomanNikitenko/che-code/commit/724c0a97f73e070f80818091a8d19b7ed186b394 \
-https://github.com/RomanNikitenko/che-code/commit/1e51134551f4c876c4d6de388dcab90180d4607d \
-https://github.com/RomanNikitenko/che-code/commit/7ea82ac755a21d2cb021736a07d8216fe294beff
+https://github.com/RomanNikitenko/che-code/commit/1e51134551f4c876c4d6de388dcab90180d4607d
 
 - code/package.json
 - code/remote/package.json
 - code/src/vs/platform/extensionManagement/node/extensionManagementService.ts
-- code/src/vs/platform/webContentExtractor/node/sharedWebContentExtractorService.ts
 ---
 
 #### @RomanNikitenko

.rebase/add/code/package.json

@@ -16,12 +16,6 @@
         },
         "postcss": {
             "nanoid": "3.3.8"
-        },
-        "@vscode/test-web": {
-            "tar-fs": "3.0.8"
-        },
-        "prebuild-install": {
-            "tar-fs": "2.1.2"
         }
     }
 }

.rebase/add/code/remote/package.json

@@ -3,10 +3,5 @@
         "ws": "8.2.3",
         "js-yaml": "^4.1.0",
         "@kubernetes/client-node": "^0.22.0"
-    },
-    "overrides": {
-        "prebuild-install": {
-            "tar-fs": "2.1.2"
-        }
     }
 }

.rebase/override/code/package.json

@@ -6,7 +6,6 @@
     },
     "devDependencies": {
       "@vscode/l10n-dev": "0.0.18",
-      "electron": "30.5.1",
-      "typescript": "5.6.0-dev.20240715"
+      "electron": "30.5.1"
     }
 }

build/artifacts/artifacts.lock.yaml

@@ -7,9 +7,9 @@ artifacts:
     filename: ms-vscode.js-debug-companion.1.1.3.vsix
     checksum: sha256:7380a890787452f14b2db7835dfa94de538caf358ebc263f9d46dd68ac52de93
   # ms-vscode.js-debug
-  - download_url: https://open-vsx.org/api/ms-vscode/js-debug/1.97.1/file/ms-vscode.js-debug-1.97.1.vsix
-    filename: ms-vscode.js-debug.1.97.1.vsix
-    checksum: sha256:977dd854805547702e312e176f68a1b142fa123f228258f47f0964560ad32496
+  - download_url: https://open-vsx.org/api/ms-vscode/js-debug/1.100.1/file/ms-vscode.js-debug-1.100.1.vsix
+    filename: ms-vscode.js-debug.1.100.1.vsix
+    checksum: sha256:8c2218df3422d45b95e96d9d28cdc4aa4426a2799aaaedd862d3f60ecab03844
   # ms-vscode.vscode-js-profile-table
   - download_url: https://open-vsx.org/api/ms-vscode/vscode-js-profile-table/1.0.10/file/ms-vscode.vscode-js-profile-table-1.0.10.vsix
     filename: ms-vscode.vscode-js-profile-table.1.0.10.vsix

build/dockerfiles/assembly.Dockerfile

@@ -15,7 +15,7 @@ FROM linux-musl as linux-musl-content
 FROM quay.io/eclipse/che-machine-exec:7.56.0 as machine-exec
 
 # https://registry.access.redhat.com/ubi8/ubi
-FROM registry.access.redhat.com/ubi8/ubi:8.9 AS ubi-builder
+FROM registry.access.redhat.com/ubi8/ubi:8.10 AS ubi-builder
 RUN mkdir -p /mnt/rootfs
 RUN yum install --installroot /mnt/rootfs brotli libstdc++ coreutils glibc-minimal-langpack --releasever 8 --setopt install_weak_deps=false --nodocs -y && yum --installroot /mnt/rootfs clean all
 RUN rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*

build/dockerfiles/dev.Dockerfile

@@ -34,7 +34,7 @@ ENV ZSH_DISABLE_COMPFIX="true"
 
 USER 10001
 
-ENV NODEJS_VERSION=20.18.2
+ENV NODEJS_VERSION=20.19.1
 
 ENV ELECTRON_SKIP_BINARY_DOWNLOAD=1 \
     PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0 \

build/dockerfiles/linux-libc-ubi8.Dockerfile

@@ -7,7 +7,7 @@
 #
 
 # https://registry.access.redhat.com/ubi8/nodejs-20
-FROM registry.access.redhat.com/ubi8/nodejs-20:1-73.1742991506 as linux-libc-ubi8-builder
+FROM registry.access.redhat.com/ubi8/nodejs-20:1-75.1749482737 as linux-libc-ubi8-builder
 
 USER root
 

build/dockerfiles/linux-libc-ubi9.Dockerfile

@@ -7,7 +7,7 @@
 #
 
 # https://registry.access.redhat.com/ubi9/nodejs-20
-FROM registry.access.redhat.com/ubi9/nodejs-20:9.5-1743584090 as linux-libc-ubi9-builder
+FROM registry.access.redhat.com/ubi9/nodejs-20:9.6-1749604222 as linux-libc-ubi9-builder
 
 USER root
 

build/dockerfiles/linux-musl.Dockerfile

@@ -93,11 +93,12 @@ RUN if [ "$(uname -m)" = "x86_64" ]; then \
       npm run playwright-install; \
     fi
 RUN if [ "$(uname -m)" = "x86_64" ]; then \
-      PLAYWRIGHT_CHROMIUM_PATH=$(echo /root/.cache/ms-playwright/chromium-*/) && \
-      rm "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" && \
-      ln -s /usr/bin/chromium-browser "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" && \
-      ls -la /checode-compilation/extensions/vscode-api-tests/ && \
-      ls -la /checode-compilation/extensions/vscode-api-tests/out/; \
+      PLAYWRIGHT_HEADLESS_PATH=$(echo /root/.cache/ms-playwright/chromium_headless_shell-*/chrome-linux) && \
+      echo "Found headless_shell path: $PLAYWRIGHT_HEADLESS_PATH" && \
+      rm -f "$PLAYWRIGHT_HEADLESS_PATH/headless_shell" && \
+      ln -sf /usr/bin/chromium-browser "$PLAYWRIGHT_HEADLESS_PATH/headless_shell" && \
+      ln -sf /usr/bin/chromium-browser "$PLAYWRIGHT_HEADLESS_PATH/chrome" && \
+      ls -la "$PLAYWRIGHT_HEADLESS_PATH"; \
     fi
 
 # Run integration tests (Browser)

code/.configurations/configuration.dsc.yaml → code/.config/configuration.winget

@@ -5,31 +5,33 @@ properties:
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       directives:
         description: Install Git
-        allowPrerelease: true
+        # Requires elevation for the set operation (i.e., for installing the package)
+        securityContext: elevated
       settings:
         id: Git.Git
         source: winget
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: npm
       directives:
         description: Install NodeJS version 20
-        allowPrerelease: true
+        # Requires elevation for the set operation (i.e., for installing the package)
+        securityContext: elevated
       settings:
         id: OpenJS.NodeJS.LTS
         version: "20.14.0"
         source: winget
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       directives:
         description: Install Python 3.10
-        allowPrerelease: true
       settings:
         id: Python.Python.3.10
         source: winget
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:
         description: Install Visual Studio 2022 (any edition is OK)
-        allowPrerelease: true
+        # Requires elevation for the set operation (i.e., for installing the package)
+        securityContext: elevated
       settings:
         id: Microsoft.VisualStudio.2022.BuildTools
         source: winget
@@ -38,6 +40,8 @@ properties:
         - vsPackage
       directives:
         description: Install required VS workloads
+        # Requires elevation for the get and set operations
+        securityContext: elevated
         allowPrerelease: true
       settings:
         productId: Microsoft.VisualStudio.Product.BuildTools

code/.eslint-plugin-local/code-no-deep-import-of-internal.ts

@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { join, dirname } from 'path';
+import { createImportRuleListener } from './utils';
+
+export = new class implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			noDeepImportOfInternal: 'No deep import of internal modules allowed! Use a re-export from a non-internal module instead. Internal modules can only be imported by direct parents (any module in {{parentDir}}).'
+		},
+		docs: {
+			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+		},
+		schema: [
+			{
+				type: 'object',
+				additionalProperties: {
+					type: 'boolean'
+				}
+			}
+		]
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		const patterns = context.options[0] as Record<string, boolean>;
+		const internalModulePattern = Object.entries(patterns).map(([key, v]) => v ? key : undefined).filter(v => !!v);
+		const allowedPatterns = Object.entries(patterns).map(([key, v]) => !v ? key : undefined).filter(v => !!v);
+
+		return createImportRuleListener((node, path) => {
+			const importerModuleDir = dirname(context.filename);
+			if (path[0] === '.') {
+				path = join(importerModuleDir, path);
+			}
+			const importedModulePath = path;
+
+			const importerDirParts = splitParts(importerModuleDir);
+			const importedModuleParts = splitParts(importedModulePath);
+
+			for (let i = 0; i < importedModuleParts.length; i++) {
+				if (internalModulePattern.some(p => importedModuleParts[i].match(p)) && allowedPatterns.every(p => !importedModuleParts[i].match(p))) {
+					const importerDirJoined = importerDirParts.join('/');
+					const expectedParentDir = importedModuleParts.slice(0, i).join('/');
+					if (!importerDirJoined.startsWith(expectedParentDir)) {
+						context.report({
+							node,
+							messageId: 'noDeepImportOfInternal',
+							data: {
+								parentDir: expectedParentDir
+							}
+						});
+						return;
+					}
+				}
+			}
+		});
+	}
+};
+
+function splitParts(path: string): string[] {
+	return path.split(/\\|\//);
+}

code/.github/classifier.json

@@ -285,7 +285,7 @@
 		"workbench-fonts": {"assign": []},
 		"workbench-history": {"assign": ["bpasero"]},
 		"workbench-hot-exit": {"assign": ["bpasero"]},
-		"workbench-hover": {"assign": ["Tyriar"]},
+		"workbench-hover": {"assign": ["Tyriar", "benibenj"]},
 		"workbench-launch": {"assign": []},
 		"workbench-link": {"assign": []},
 		"workbench-multiroot": {"assign": ["bpasero"]},

code/.github/workflows/ci.yml

@@ -108,7 +108,7 @@ jobs:
       - name: Setup Build Environment
         run: |
           sudo apt-get update
-          sudo apt-get install -y libxkbfile-dev pkg-config libkrb5-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
+          sudo apt-get install -y libxkbfile-dev pkg-config libkrb5-dev libxss1 xvfb libgtk-3-0 libgbm1
           sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
           sudo chmod +x /etc/init.d/xvfb
           sudo update-rc.d xvfb defaults

code/.nvmrc

@@ -1 +1 @@
-20.18.2
+20.19.0

code/.vscode/extensions/vscode-selfhost-test-provider/src/failingDeepStrictEqualAssertFixer.ts

@@ -86,10 +86,10 @@ const tsPrinter = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
 
 const formatJsonValue = (value: unknown) => {
 	if (typeof value !== 'object') {
-		return JSON.stringify(value);
+		return JSON.stringify(value, undefined, '\t');
 	}
 
-	const src = ts.createSourceFile('', `(${JSON.stringify(value)})`, ts.ScriptTarget.ES5, true);
+	const src = ts.createSourceFile('', `(${JSON.stringify(value, undefined, '\t')})`, ts.ScriptTarget.ES5, true);
 	const outerExpression = src.statements[0] as ts.ExpressionStatement;
 	const parenExpression = outerExpression.expression as ts.ParenthesizedExpression;
 

code/.vscode/extensions/vscode-selfhost-test-provider/src/vscodeTestRunner.ts

@@ -306,9 +306,7 @@ export class DarwinTestRunner extends PosixTestRunner {
 	protected override getDefaultArgs() {
 		return [
 			TEST_ELECTRON_SCRIPT_PATH,
-			'--no-sandbox',
-			'--disable-dev-shm-usage',
-			'--use-gl=swiftshader',
+			'--no-sandbox'
 		];
 	}
 

code/.vscode/notebooks/api.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"March 2025\""
+    "value": "$REPO=repo:microsoft/vscode\n$MILESTONE=milestone:\"April 2025\""
   },
   {
     "kind": 1,

code/.vscode/notebooks/endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r\n\r\n$MILESTONE=milestone:\"March 2025\""
+    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"April 2025\""
   },
   {
     "kind": 1,

code/.vscode/notebooks/my-endgame.github-issues

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"March 2025\"\n\n$MINE=assignee:@me"
+    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"April 2025\"\n\n$MINE=assignee:@me"
   },
   {
     "kind": 1,

code/.vscode/settings.json

@@ -168,13 +168,16 @@
 	"[github-issues]": {
 		"editor.wordWrap": "on"
 	},
+	"inlineChat.enableV2": true,
 	"css.format.spaceAroundSelectorSeparator": true,
-	"typescript.enablePromptUseWorkspaceTsdk": true,
 	"eslint.useFlatConfig": true,
 	"editor.occurrencesHighlightDelay": 0,
+	// "editor.experimental.preferTreeSitter.typescript": true,
+	// "editor.experimental.preferTreeSitter.regex": true,
+	// "editor.experimental.preferTreeSitter.css": true,
 	"typescript.experimental.expandableHover": true,
-	"git.diagnosticsCommitHook.Enabled": true,
-	"git.diagnosticsCommitHook.Sources": {
+	"git.diagnosticsCommitHook.enabled": true,
+	"git.diagnosticsCommitHook.sources": {
 		"*": "error",
 		"ts": "warning",
 		"eslint": "warning"