Merge branch 'main' into fix_sticky_tabs

Author: Timmmm

.github/classifier.json

@@ -1,6 +1,6 @@
 {
-	"$schema": "https://raw.githubusercontent.com/microsoft/vscode-github-triage-actions/master/classifier-deep/apply/apply-labels/deep-classifier-config.schema.json",
-	"vacation": ["RMacfarlane", "eamodio"],
+	"$schema": "https://raw.githubusercontent.com/microsoft/vscode-github-triage-actions/stable/classifier-deep/apply/apply-labels/deep-classifier-config.schema.json",
+	"vacation": [],
 	"assignees": {
 		"nameToOverrideAccuracyOf": {"accuracy": 0.8}
 	},
@@ -23,7 +23,7 @@
 		"context-keys": {"assign": []},
 		"css-less-scss": {"assign": ["aeschli"]},
 		"custom-editors": {"assign": ["mjbvz"]},
-		"debug": {"assign": ["weinand"]},
+		"debug": {"assign": ["roblourens"]},
 		"dialogs": {"assign": ["sbatten"]},
 		"diff-editor": {"assign": ["alexdima"]},
 		"dropdown": {"assign": []},
@@ -85,7 +85,7 @@
 		"html": {"assign": ["aeschli"]},
 		"i18n": {"assign": []},
 		"icon-brand": {"assign": []},
-		"icons-product": {"assign": ["misolori"]},
+		"icons-product": {"assign": ["daviddossett"]},
 		"inlay-hints": {"assign": ["jrieken", "hediet"]},
 		"inline-completions": {"assign": ["hediet"]},
 		"install-update": {"assign": []},
@@ -132,7 +132,7 @@
 		"rename": {"assign": ["jrieken"]},
 		"scm": {"assign": ["lszomoru"]},
 		"screencast-mode": {"assign": ["lszomoru"]},
-		"search": {"assign": ["roblourens"]},
+		"search": {"assign": ["roblourens", "andreamah"]},
 		"search-editor": {"assign": ["roblourens"]},
 		"search-replace": {"assign": ["sandy081"]},
 		"semantic-tokens": {"assign": ["alexdima", "aeschli"]},
@@ -158,7 +158,7 @@
 		"undo-redo": {"assign": ["alexdima"]},
 		"unit-test": {"assign": []},
 		"uri": {"assign": ["jrieken"]},
-		"ux": {"assign": ["misolori"]},
+		"ux": {"assign": ["daviddossett"]},
 		"variable-resolving": {"assign": []},
 		"vscode-build": {"assign": []},
 		"web": {"assign": []},

.github/commands.json

@@ -75,7 +75,7 @@
 		"name": "*caused-by-extension",
 		"action": "close",
 		"reason": "not_planned",
-		"comment": "This issue is caused by an extension, please file it with the repository (or contact) the extension has linked in its overview in VS Code or the [marketplace](https://aka.ms/vscodemarketplace) for VS Code. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
+		"comment": "This issue is caused by an extension, please file it with the repository (or contact) the extension has linked in its overview in VS Code or the [marketplace](https://aka.ms/vscodemarketplace) for VS Code. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). If you don't know which extension is causing the problem, you can run `Help: Start extension bisect` from the command palette (F1) to help identify the problem extension.\n\nHappy Coding!"
 	},
 	{
 		"type": "label",
@@ -84,21 +84,6 @@
 		"reason": "not_planned",
 		"comment": "The described behavior is how it is expected to work. If you disagree, please explain what is expected and what is not in more detail. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
 	},
-	{
-		"type": "label",
-		"name": "notebook",
-		"regex": "notebook.*",
-		"assign": [
-			"rebornix"
-		]
-	},
-	{
-		"type": "label",
-		"name": "notebook-triage",
-		"regex": "notebook.*",
-		"action": "updateLabels",
-		"addLabel": "notebook-triage"
-	},
 	{
 		"type": "label",
 		"name": "L10N",

.github/workflows/ci.yml

@@ -69,7 +69,7 @@ jobs:
           7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt
 
       - name: Compile and Download
-        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+        run: DEBUG=pw:install yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
 
       - name: Compile Integration Tests
         run: yarn --cwd test/integration/browser compile
@@ -145,7 +145,7 @@ jobs:
         run: yarn --frozen-lockfile --network-timeout 180000
 
       - name: Compile and Download
-        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+        run: DEBUG=pw:install yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
 
       - name: Compile Integration Tests
         run: yarn --cwd test/integration/browser compile
@@ -216,7 +216,7 @@ jobs:
         run: yarn --frozen-lockfile --network-timeout 180000
 
       - name: Compile and Download
-        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+        run: DEBUG=pw:install yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
 
       - name: Compile Integration Tests
         run: yarn --cwd test/integration/browser compile
@@ -289,7 +289,7 @@ jobs:
         run: yarn --frozen-lockfile --network-timeout 180000
 
       - name: Download Playwright
-        run: yarn playwright-install
+        run: DEBUG=pw:install yarn playwright-install
 
       - name: Run Hygiene Checks
         run: yarn gulp hygiene

.github/workflows/monaco-editor.yml

@@ -53,7 +53,7 @@ jobs:
         run: yarn --frozen-lockfile --network-timeout 180000
 
       - name: Download Playwright
-        run: yarn playwright-install
+        run: DEBUG=pw:install yarn playwright-install
 
       - name: Run Monaco Editor Checks
         run: yarn monaco-compile-check

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

@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce\n\n// current milestone name\n$milestone=milestone:\"August 2022\""
+    "value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce\n\n// current milestone name\n$milestone=milestone:\"September 2022\""
   },
   {
     "kind": 1,

.vscode/settings.json

@@ -68,6 +68,7 @@
 	],
 	"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
 	"git.branchRandomName.enable": true,
+	"git.fetchBeforeCheckout": true,
 	"git.mergeEditor": true,
 	"remote.extensionKind": {
 		"msjsdiag.debugger-for-chrome": "workspace"

.yarnrc

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

build/azure-pipelines/common/createAsset.js

@@ -150,41 +150,49 @@ async function main() {
     const blobServiceClient = new storage_blob_1.BlobServiceClient(`https://vscode.blob.core.windows.net`, credential, storagePipelineOptions);
     const containerClient = blobServiceClient.getContainerClient(quality);
     const blobClient = containerClient.getBlockBlobClient(blobName);
-    const blobExists = await blobClient.exists();
-    if (blobExists) {
-        console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
-        return;
-    }
     const blobOptions = {
         blobHTTPHeaders: {
             blobContentType: mime.lookup(filePath),
             blobContentDisposition: `attachment; filename="${fileName}"`,
             blobCacheControl: 'max-age=31536000, public'
         }
     };
-    const uploadPromises = [
-        (0, retry_1.retry)(async () => {
+    const uploadPromises = [];
+    if (await blobClient.exists()) {
+        console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
+    }
+    else {
+        uploadPromises.push((0, retry_1.retry)(async () => {
             await blobClient.uploadFile(filePath, blobOptions);
             console.log('Blob successfully uploaded to Azure storage.');
-        })
-    ];
+        }));
+    }
     const shouldUploadToMooncake = /true/i.test(process.env['VSCODE_PUBLISH_TO_MOONCAKE'] ?? 'true');
     if (shouldUploadToMooncake) {
         const mooncakeCredential = new identity_1.ClientSecretCredential(process.env['AZURE_MOONCAKE_TENANT_ID'], process.env['AZURE_MOONCAKE_CLIENT_ID'], process.env['AZURE_MOONCAKE_CLIENT_SECRET']);
         const mooncakeBlobServiceClient = new storage_blob_1.BlobServiceClient(`https://vscode.blob.core.chinacloudapi.cn`, mooncakeCredential, storagePipelineOptions);
         const mooncakeContainerClient = mooncakeBlobServiceClient.getContainerClient(quality);
         const mooncakeBlobClient = mooncakeContainerClient.getBlockBlobClient(blobName);
-        uploadPromises.push((0, retry_1.retry)(async () => {
-            await mooncakeBlobClient.uploadFile(filePath, blobOptions);
-            console.log('Blob successfully uploaded to Mooncake Azure storage.');
-        }));
-        console.log('Uploading blobs to Azure storage and Mooncake Azure storage...');
+        if (await mooncakeBlobClient.exists()) {
+            console.log(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`);
+        }
+        else {
+            uploadPromises.push((0, retry_1.retry)(async () => {
+                await mooncakeBlobClient.uploadFile(filePath, blobOptions);
+                console.log('Blob successfully uploaded to Mooncake Azure storage.');
+            }));
+        }
+        if (uploadPromises.length) {
+            console.log('Uploading blobs to Azure storage and Mooncake Azure storage...');
+        }
     }
     else {
-        console.log('Uploading blobs to Azure storage...');
+        if (uploadPromises.length) {
+            console.log('Uploading blobs to Azure storage...');
+        }
     }
     await Promise.all(uploadPromises);
-    console.log('All blobs successfully uploaded.');
+    console.log(uploadPromises.length ? 'All blobs successfully uploaded.' : 'No blobs to upload.');
     const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`;
     const blobPath = new URL(assetUrl).pathname;
     const mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`;

build/azure-pipelines/common/createAsset.ts

@@ -178,12 +178,6 @@ async function main(): Promise<void> {
 	const blobServiceClient = new BlobServiceClient(`https://vscode.blob.core.windows.net`, credential, storagePipelineOptions);
 	const containerClient = blobServiceClient.getContainerClient(quality);
 	const blobClient = containerClient.getBlockBlobClient(blobName);
-	const blobExists = await blobClient.exists();
-
-	if (blobExists) {
-		console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
-		return;
-	}
 
 	const blobOptions: BlockBlobParallelUploadOptions = {
 		blobHTTPHeaders: {
@@ -193,12 +187,15 @@ async function main(): Promise<void> {
 		}
 	};
 
-	const uploadPromises: Promise<void>[] = [
-		retry(async () => {
+	const uploadPromises: Promise<void>[] = [];
+	if (await blobClient.exists()) {
+		console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
+	} else {
+		uploadPromises.push(retry(async () => {
 			await blobClient.uploadFile(filePath, blobOptions);
 			console.log('Blob successfully uploaded to Azure storage.');
-		})
-	];
+		}));
+	}
 
 	const shouldUploadToMooncake = /true/i.test(process.env['VSCODE_PUBLISH_TO_MOONCAKE'] ?? 'true');
 
@@ -208,18 +205,27 @@ async function main(): Promise<void> {
 		const mooncakeContainerClient = mooncakeBlobServiceClient.getContainerClient(quality);
 		const mooncakeBlobClient = mooncakeContainerClient.getBlockBlobClient(blobName);
 
-		uploadPromises.push(retry(async () => {
-			await mooncakeBlobClient.uploadFile(filePath, blobOptions);
-			console.log('Blob successfully uploaded to Mooncake Azure storage.');
-		}));
+		if (await mooncakeBlobClient.exists()) {
+			console.log(`Mooncake Blob ${quality}, ${blobName} already exists, not publishing again.`);
+		} else {
+			uploadPromises.push(retry(async () => {
+				await mooncakeBlobClient.uploadFile(filePath, blobOptions);
+				console.log('Blob successfully uploaded to Mooncake Azure storage.');
+			}));
+		}
 
-		console.log('Uploading blobs to Azure storage and Mooncake Azure storage...');
+		if (uploadPromises.length) {
+			console.log('Uploading blobs to Azure storage and Mooncake Azure storage...');
+		}
 	} else {
-		console.log('Uploading blobs to Azure storage...');
+		if (uploadPromises.length) {
+			console.log('Uploading blobs to Azure storage...');
+		}
 	}
 
 	await Promise.all(uploadPromises);
-	console.log('All blobs successfully uploaded.');
+
+	console.log(uploadPromises.length ? 'All blobs successfully uploaded.' : 'No blobs to upload.');
 
 	const assetUrl = `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`;
 	const blobPath = new URL(assetUrl).pathname;

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

@@ -114,12 +114,6 @@ steps:
     artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive
     displayName: Download $(VSCODE_ARCH) artifact
 
-  - script: |
-      set -e
-      unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip -d $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
-      mv $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip
-    displayName: Unzip & move
-
   - task: UseDotNet@2
     inputs:
       version: 2.x
@@ -129,20 +123,38 @@ steps:
 
   - script: |
       set -e
-      node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-sign $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(agent.builddirectory) VSCode-darwin-$(VSCODE_ARCH).zip
+      node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-sign $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive VSCode-darwin-$(VSCODE_ARCH).zip
     displayName: Codesign
 
   - script: |
       set -e
-      node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(agent.builddirectory) VSCode-darwin-$(VSCODE_ARCH).zip
+      node build/azure-pipelines/common/sign "$(esrpclient.toolpath)/$(esrpclient.toolname)" darwin-notarize $(ESRP-PKI) $(esrp-aad-username) $(esrp-aad-password) $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive VSCode-darwin-$(VSCODE_ARCH).zip
     displayName: Notarize
 
   - script: |
       set -e
-      APP_ROOT=$(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)
+      unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-$(VSCODE_ARCH).zip -d $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)
+    displayName: Extract signed app
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - script: |
+      set -e
+      APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)"
       APP_NAME="`ls $APP_ROOT | head -n 1`"
-      "$APP_ROOT/$APP_NAME/Contents/Resources/app/bin/code" --export-default-configuration=.build
-    displayName: Verify start after signing (export configuration)
+      echo "##vso[task.setvariable variable=APP_PATH]$APP_ROOT/$APP_NAME"
+    displayName: Find application path
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - script: |
+      set -e
+      codesign -dv --deep --verbose=4 "$(APP_PATH)"
+    displayName: Verify signature
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
+
+  - script: |
+      set -e
+      "$(APP_PATH)/Contents/Resources/app/bin/code" --export-default-configuration=.build
+    displayName: Verify signed application starts OK
     condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'arm64'))
 
   - script: |
@@ -155,9 +167,9 @@ steps:
       echo "##vso[task.setvariable variable=ASSET_ID]$ASSET_ID"
     displayName: Set asset id variable
 
-  - script: mv $(agent.builddirectory)/VSCode-darwin-x64.zip $(agent.builddirectory)/VSCode-darwin.zip
-    displayName: Rename x64 build to it's legacy name
+  - script: mv $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin-x64.zip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-darwin.zip
+    displayName: Rename x64 build to its legacy name
     condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
-  - publish: $(Agent.BuildDirectory)/VSCode-$(ASSET_ID).zip
+  - publish: $(Pipeline.Workspace)/unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive/VSCode-$(ASSET_ID).zip
     artifact: vscode_client_darwin_$(VSCODE_ARCH)_archive