Merge branch 'main' into bug/diff-breakpoint-clash

.eslintrc.json

@@ -222,6 +222,8 @@
 							"@vscode/iconv-lite-umd",
 							"@vscode/policy-watcher",
 							"@vscode/proxy-agent",
+							"@vscode/spdlog",
+							"@vscode/windows-process-tree",
 							"assert",
 							"child_process",
 							"console",
@@ -241,7 +243,6 @@
 							"os",
 							"path",
 							"perf_hooks",
-							"spdlog",
 							"stream",
 							"string_decoder",
 							"tas-client-umd",
@@ -251,7 +252,6 @@
 							"v8-inspect-profiler",
 							"vscode-regexpp",
 							"vscode-textmate",
-							"windows-process-tree",
 							"worker_threads",
 							"xterm",
 							"xterm-addon-canvas",

.github/classifier.json

@@ -199,9 +199,9 @@
 		"sash-widget": {"assign": ["joaomoreno"]},
 		"scm": {"assign": ["lszomoru"]},
 		"screencast-mode": {"assign": ["joaomoreno"]},
-		"search": {"assign": ["andreamah"]},
-		"search-api": {"assign": ["andreamah"]},
-		"search-editor": {"assign": ["andreamah"]},
+		"search": {"assign": ["andreamah", "roblourens"]},
+		"search-api": {"assign": ["andreamah", "roblourens"]},
+		"search-editor": {"assign": ["andreamah", "roblourens"]},
 		"search-replace": {"assign": ["sandy081"]},
 		"semantic-tokens": {"assign": ["alexdima", "aeschli"]},
 		"server": {"assign": ["alexdima"]},

.gitignore

@@ -16,3 +16,4 @@ vscode.lsif
 vscode.db
 /.profile-oss
 /cli/target
+product.overrides.json

.vscode/extensions.json

@@ -4,6 +4,8 @@
 	"recommendations": [
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
+		"GitHub.vscode-pull-request-github",
+		"ms-vscode.vscode-github-issue-notebooks",
 		"ms-vscode.vscode-selfhost-test-provider"
 	]
 }

.vscode/launch.json

@@ -526,7 +526,7 @@
 			"name": "Monaco Editor Playground",
 			"type": "chrome",
 			"request": "launch",
-			"url": "https://microsoft.github.io/monaco-editor/playground.html?source=http%3A%2F%2Flocalhost%3A5001%2Fout%2Fvs",
+			"url": "http://localhost:5001",
 			"preLaunchTask": "Launch Http Server",
 			"presentation": {
 				"group": "monaco",

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

@@ -177,6 +177,6 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:on-release-notes\nrepo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:engineering -label:on-release-notes"
+    "value": "repo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:on-release-notes\nrepo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:engineering -label:on-release-notes\nrepo:microsoft/vscode $MILESTONE $MINE is:issue is:closed reason:completed label:plan-item -label:on-release-notes"
   }
 ]

.vscode/settings.json

@@ -125,5 +125,5 @@
 	],
 	"application.experimental.rendererProfiling": true,
 	"editor.experimental.asyncTokenization": true,
-	"diffEditor.diffAlgorithm": "experimental"
+	"editor.experimental.asyncTokenizationVerification": true
 }

.vscode/tasks.json

@@ -260,7 +260,7 @@
 			// Used for monaco editor playground launch config
 			"label": "Launch Http Server",
 			"type": "shell",
-			"command": "node_modules/.bin/http-server --cors --port 5001 -a 127.0.0.1 -c-1 -s",
+			"command": "node_modules/.bin/ts-node -T ./scripts/playground-server",
 			"isBackground": true,
 			"problemMatcher": {
 				"pattern": {

.yarnrc

@@ -1,4 +1,4 @@
 disturl "https://electronjs.org/headers"
-target "22.3.3"
+target "22.3.5"
 runtime "electron"
 build_from_source "true"

build/.moduleignore

@@ -12,6 +12,14 @@ fsevents/src/**
 fsevents/test/**
 !fsevents/**/*.node
 
+@vscode/spdlog/binding.gyp
+@vscode/spdlog/build/**
+@vscode/spdlog/deps/**
+@vscode/spdlog/src/**
+@vscode/spdlog/test/**
+@vscode/spdlog/*.yml
+!@vscode/spdlog/build/Release/*.node
+
 @vscode/sqlite3/binding.gyp
 @vscode/sqlite3/benchmark/**
 @vscode/sqlite3/cloudformation/**
@@ -21,16 +29,21 @@ fsevents/test/**
 @vscode/sqlite3/src/**
 !@vscode/sqlite3/build/Release/*.node
 
+@vscode/windows-mutex/binding.gyp
+@vscode/windows-mutex/build/**
+@vscode/windows-mutex/src/**
+!@vscode/windows-mutex/**/*.node
+
+@vscode/windows-process-tree/binding.gyp
+@vscode/windows-process-tree/build/**
+@vscode/windows-process-tree/src/**
+!@vscode/windows-process-tree/**/*.node
+
 @vscode/windows-registry/binding.gyp
 @vscode/windows-registry/src/**
 @vscode/windows-registry/build/**
 !@vscode/windows-registry/build/Release/*.node
 
-windows-mutex/binding.gyp
-windows-mutex/build/**
-windows-mutex/src/**
-!windows-mutex/**/*.node
-
 native-keymap/binding.gyp
 native-keymap/build/**
 native-keymap/src/**
@@ -53,24 +66,11 @@ node-vsce-sign/**
 !node-vsce-sign/package.json
 !node-vsce-sign/bin/**
 
-spdlog/binding.gyp
-spdlog/build/**
-spdlog/deps/**
-spdlog/src/**
-spdlog/test/**
-spdlog/*.yml
-!spdlog/build/Release/*.node
-
 windows-foreground-love/binding.gyp
 windows-foreground-love/build/**
 windows-foreground-love/src/**
 !windows-foreground-love/**/*.node
 
-windows-process-tree/binding.gyp
-windows-process-tree/build/**
-windows-process-tree/src/**
-!windows-process-tree/**/*.node
-
 keytar/binding.gyp
 keytar/build/**
 keytar/src/**

build/azure-pipelines/alpine/cli-build-alpine.yml

@@ -44,6 +44,8 @@ steps:
   - script: node build/azure-pipelines/cli/prepare.js
     displayName: Prepare CLI build
     env:
+      VSCODE_CLI_PREPARE_ROOT: $(Build.SourcesDirectory)/.build/distro
+      VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
 
   - template: ../cli/install-rust-posix.yml

build/azure-pipelines/cli/prepare.ts

@@ -16,13 +16,13 @@ const isOSS = process.env.VSCODE_QUALITY === 'oss' || !process.env.VSCODE_QUALIT
 if (isOSS) {
 	productJsonPath = path.join(root, 'product.json');
 } else {
-	productJsonPath = path.join(root, '.build', 'distro', 'mixin', process.env.VSCODE_QUALITY!, 'product.json');
+	productJsonPath = path.join(root, 'mixin', process.env.VSCODE_QUALITY!, 'product.json');
 }
 
 console.error('Loading product.json from', productJsonPath);
 const product = readJSON(productJsonPath);
-const allProductsAndQualities = isOSS ? [product] : fs.readdirSync(path.join(root, '.build', 'distro', 'mixin'))
-	.map(quality => ({ quality, json: readJSON(path.join(root, '.build', 'distro', 'mixin', quality, 'product.json')) }));
+const allProductsAndQualities = isOSS ? [product] : fs.readdirSync(path.join(root, 'mixin'))
+	.map(quality => ({ quality, json: readJSON(path.join(root, 'mixin', quality, 'product.json')) }));
 const commit = getVersion(root);
 
 const makeQualityMap = <T>(m: (productJson: any, quality: string) => T): Record<string, T> => {
@@ -51,6 +51,8 @@ const setLauncherEnvironmentVars = () => {
 		['VSCODE_CLI_DOCUMENTATION_URL', product.documentationUrl],
 		['VSCODE_CLI_APPLICATION_NAME', product.applicationName],
 		['VSCODE_CLI_EDITOR_WEB_URL', product.tunnelApplicationConfig?.editorWebUrl],
+		['VSCODE_CLI_TUNNEL_SERVICE_MUTEX', product.win32TunnelServiceMutex],
+		['VSCODE_CLI_TUNNEL_CLI_MUTEX', product.win32TunnelMutex],
 		['VSCODE_CLI_COMMIT', commit],
 		[
 			'VSCODE_CLI_WIN32_APP_IDS',

build/azure-pipelines/darwin/cli-build-darwin.yml

@@ -36,6 +36,8 @@ steps:
   - script: node build/azure-pipelines/cli/prepare.js
     displayName: Prepare CLI build
     env:
+      VSCODE_CLI_PREPARE_ROOT: $(Build.SourcesDirectory)/.build/distro
+      VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
 
   - template: ../cli/install-rust-posix.yml

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -108,8 +108,9 @@ steps:
     - script: node build/azure-pipelines/distro/mixin-quality
       displayName: Mixin distro quality
 
-    - template: ../common/install-builtin-extensions.yml
+  - template: ../common/install-builtin-extensions.yml
 
+  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"

build/azure-pipelines/linux/cli-build-linux.yml

@@ -47,6 +47,8 @@ steps:
   - script: node build/azure-pipelines/cli/prepare.js
     displayName: Prepare CLI build
     env:
+      VSCODE_CLI_PREPARE_ROOT: $(Build.SourcesDirectory)/.build/distro
+      VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }}
       GITHUB_TOKEN: "$(github-distro-mixin-password)"
 
   - template: ../cli/install-rust-posix.yml

build/azure-pipelines/linux/product-build-linux.yml

@@ -186,8 +186,9 @@ steps:
     - script: node build/azure-pipelines/distro/mixin-quality
       displayName: Mixin distro quality
 
-    - template: ../common/install-builtin-extensions.yml
+  - template: ../common/install-builtin-extensions.yml
 
+  - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
       env:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"