Merge branch 'main' into aiday/positioningInlineChat

Author: aiday-mar

.github/workflows/rich-navigation.yml renamed to .github/workflows/rich-navigation.yml.off

@@ -1 +1 @@
-2023-03-31T12:39:03.753Z
+2023-06-12T12:55:48.130Z

build/.cachesalt

@@ -37,6 +37,8 @@ fsevents/test/**
 @vscode/windows-process-tree/binding.gyp
 @vscode/windows-process-tree/build/**
 @vscode/windows-process-tree/src/**
+@vscode/windows-process-tree/tsconfig.json
+@vscode/windows-process-tree/tslint.json
 !@vscode/windows-process-tree/**/*.node
 
 @vscode/windows-registry/binding.gyp

build/.moduleignore

@@ -3,6 +3,12 @@
 @vscode/windows-mutex/*.md
 @vscode/windows-mutex/package.json
 
+@vscode/windows-process-tree/lib/**
+@vscode/windows-process-tree/**/*.node
+@vscode/windows-process-tree/LICENSE
+@vscode/windows-process-tree/package.json
+@vscode/windows-process-tree/*.md
+
 @vscode/windows-registry/dist/**
 @vscode/windows-registry/**/*.node
 @vscode/windows-registry/*.md

build/.moduleignore.darwin

@@ -3,6 +3,12 @@
 @vscode/windows-mutex/*.md
 @vscode/windows-mutex/package.json
 
+@vscode/windows-process-tree/lib/**
+@vscode/windows-process-tree/**/*.node
+@vscode/windows-process-tree/LICENSE
+@vscode/windows-process-tree/package.json
+@vscode/windows-process-tree/*.md
+
 @vscode/windows-registry/dist/**
 @vscode/windows-registry/**/*.node
 @vscode/windows-registry/*.md

build/.moduleignore.linux

@@ -86,16 +86,10 @@ steps:
   # TODO@joaomoreno TODO@deepak1556 this should be part of the base image
   - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
     - script: |
-        if [ "$VSCODE_ARCH" = "x64" ]; then
-          OS=ubuntu
-        else
-          OS=debian
-        fi
-
         sudo apt-get update && sudo apt-get install -y ca-certificates curl gnupg
         sudo mkdir -m 0755 -p /etc/apt/keyrings
-        curl -fsSL https://download.docker.com/linux/$OS/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-        echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/$OS "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+        curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+        echo "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
         sudo apt update && sudo apt install -y docker-ce-cli
       displayName: Install Docker client
       condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))

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

@@ -144,11 +144,11 @@ resources:
       endpoint: VSCodeHub
       options: --user 0:0 --cap-add SYS_ADMIN
     - container: vscode-arm64
-      image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-arm64
+      image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic-arm64
       endpoint: VSCodeHub
       options: --user 0:0 --cap-add SYS_ADMIN
     - container: vscode-armhf
-      image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-armhf
+      image: vscodehub.azurecr.io/vscode-linux-build-agent:bionic-armhf
       endpoint: VSCodeHub
       options: --user 0:0 --cap-add SYS_ADMIN
     - container: snapcraft

build/azure-pipelines/product-build.yml

@@ -17,7 +17,7 @@ import * as os from 'os';
 import ts = require('typescript');
 import * as File from 'vinyl';
 import * as task from './task';
-import { Mangler } from './mangleTypeScript';
+import { Mangler } from './mangle/index';
 import { RawSourceMap } from 'source-map';
 const watch = require('./watch');
 
@@ -124,21 +124,22 @@ export function compileTask(src: string, out: string, build: boolean, options: {
 		// mangle: TypeScript to TypeScript
 		let mangleStream = es.through();
 		if (build && !options.disableMangle) {
-			let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
+			let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
 			const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
-			mangleStream = es.through(function write(data: File & { sourceMap?: RawSourceMap }) {
+			mangleStream = es.through(async function write(data: File & { sourceMap?: RawSourceMap }) {
 				type TypeScriptExt = typeof ts & { normalizePath(path: string): string };
 				const tsNormalPath = (<TypeScriptExt>ts).normalizePath(data.path);
-				const newContents = newContentsByFileName.get(tsNormalPath);
+				const newContents = (await newContentsByFileName).get(tsNormalPath);
 				if (newContents !== undefined) {
 					data.contents = Buffer.from(newContents.out);
 					data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap);
 				}
 				this.push(data);
-			}, function end() {
-				this.push(null);
+			}, async function end() {
 				// free resources
-				newContentsByFileName.clear();
+				(await newContentsByFileName).clear();
+
+				this.push(null);
 				(<any>ts2tsMangler) = undefined;
 			});
 		}

build/lib/compilation.js

@@ -521,6 +521,10 @@
 		{
 			"name": "vs/workbench/contrib/accessibility",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/issue",
+			"project": "vscode-workbench"
 		}
 	]
 }