Merge branch 'main' into support-three-or-more-chords

.eslintrc.json

@@ -181,6 +181,7 @@
 							"invalidate",
 							"open",
 							"override",
+							"perform",
 							"receive",
 							"register",
 							"remove",

build/azure-pipelines/common/telemetry-config.json

@@ -49,16 +49,6 @@
 		"excludedDirs": [],
 		"applyEndpoints": true
 	},
-	{
-		"eventPrefix": "ms-vscode.node2/",
-		"sourceDirs": [
-			"vscode-chrome-debug-core",
-			"vscode-node-debug2"
-		],
-		"excludedDirs": [],
-		"applyEndpoints": true,
-		"patchDebugEvents": true
-	},
 	{
 		"eventPrefix": "ms-vscode.node/",
 		"sourceDirs": [
@@ -69,4 +59,4 @@
 		"applyEndpoints": true,
 		"patchDebugEvents": true
 	}
-]
+]

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

@@ -60,6 +60,7 @@ steps:
         VSCODE_CLI_ENV:
           OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-windows-static-md/lib
           OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-windows-static-md/include
+          RUSTFLAGS: '-C target-feature=+crt-static'
 
   - ${{ if eq(parameters.VSCODE_BUILD_WIN32_ARM64, true) }}:
     - template: ../cli/cli-compile-and-publish.yml
@@ -69,6 +70,7 @@ steps:
         VSCODE_CLI_ENV:
           OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-windows-static-md/lib
           OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-windows-static-md/include
+          RUSTFLAGS: '-C target-feature=+crt-static'
 
   - ${{ if eq(parameters.VSCODE_BUILD_WIN32_32BIT, true) }}:
     - template: ../cli/cli-compile-and-publish.yml
@@ -78,3 +80,4 @@ steps:
         VSCODE_CLI_ENV:
           OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x86-windows-static-md/lib
           OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x86-windows-static-md/include
+          RUSTFLAGS: '-C target-feature=+crt-static'

build/filters.js

@@ -194,3 +194,7 @@ module.exports.eslintFilter = [
 		.filter(line => !!line)
 		.map(line => `!${line}`)
 ];
+
+module.exports.stylelintFilter = [
+	'src/**/*.css'
+];

build/gulpfile.editor.js

@@ -85,7 +85,8 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
 	});
 });
 
-const compileEditorAMDTask = task.define('compile-editor-amd', compilation.compileTask('out-editor-src', 'out-editor-build', true));
+// Disable mangling for the editor, as it complicates debugging & quite a few users rely on private/protected fields.
+const compileEditorAMDTask = task.define('compile-editor-amd', compilation.compileTask('out-editor-src', 'out-editor-build', true, { disableMangle: true }));
 
 const optimizeEditorAMDTask = task.define('optimize-editor-amd', optimize.optimizeTask(
 	{

build/gulpfile.vscode.web.js

@@ -83,7 +83,7 @@ const buildDate = new Date().toISOString();
  */
 const createVSCodeWebProductConfigurationPatcher = (product) => {
 	/**
-	 * @param content {string} The contens of the file
+	 * @param content {string} The contents of the file
 	 * @param path {string} The absolute file path, always using `/`, even on Windows
 	 */
 	const result = (content, path) => {
@@ -108,7 +108,7 @@ const createVSCodeWebProductConfigurationPatcher = (product) => {
  */
 const createVSCodeWebBuiltinExtensionsPatcher = (extensionsRoot) => {
 	/**
-	 * @param content {string} The contens of the file
+	 * @param content {string} The contents of the file
 	 * @param path {string} The absolute file path, always using `/`, even on Windows
 	 */
 	const result = (content, path) => {
@@ -128,7 +128,7 @@ const createVSCodeWebBuiltinExtensionsPatcher = (extensionsRoot) => {
  */
 const combineContentPatchers = (...patchers) => {
 	/**
-	 * @param content {string} The contens of the file
+	 * @param content {string} The contents of the file
 	 * @param path {string} The absolute file path, always using `/`, even on Windows
 	 */
 	const result = (content, path) => {

build/hygiene.js

@@ -11,7 +11,7 @@ const path = require('path');
 const fs = require('fs');
 const pall = require('p-all');
 
-const { all, copyrightFilter, unicodeFilter, indentationFilter, tsFormattingFilter, eslintFilter } = require('./filters');
+const { all, copyrightFilter, unicodeFilter, indentationFilter, tsFormattingFilter, eslintFilter, stylelintFilter } = require('./filters');
 
 const copyrightHeaderLines = [
 	'/*---------------------------------------------------------------------------------------------',
@@ -22,6 +22,7 @@ const copyrightHeaderLines = [
 
 function hygiene(some, linting = true) {
 	const gulpeslint = require('gulp-eslint');
+	const gulpstylelint = require('./stylelint');
 	const tsfmt = require('typescript-formatter');
 
 	let errorCount = 0;
@@ -185,6 +186,12 @@ function hygiene(some, linting = true) {
 					})
 				)
 		);
+		streams.push(
+			result.pipe(filter(stylelintFilter)).pipe(gulpstylelint((error => {
+				console.error(error);
+				errorCount++;
+			})))
+		);
 	}
 
 	let count = 0;

build/lib/compilation.ts

@@ -106,7 +106,7 @@ export function transpileTask(src: string, out: string, swc: boolean): () => Nod
 	};
 }
 
-export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {
+export function compileTask(src: string, out: string, build: boolean, options: { disableMangle?: boolean } = {}): () => NodeJS.ReadWriteStream {
 
 	return function () {
 
@@ -123,7 +123,7 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod
 
 		// mangle: TypeScript to TypeScript
 		let mangleStream = es.through();
-		if (build) {
+		if (build && !options.disableMangle) {
 			let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
 			const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
 			mangleStream = es.through(function write(data: File & { sourceMap?: RawSourceMap }) {

build/lib/extensions.ts

@@ -416,7 +416,6 @@ export interface IScannedBuiltinExtension {
 	extensionPath: string;
 	packageJSON: any;
 	packageNLS?: any;
-	browserNlsMetadataPath?: string;
 	readmePath?: string;
 	changelogPath?: string;
 }
@@ -441,21 +440,13 @@ export function scanBuiltinExtensions(extensionsRoot: string, exclude: string[]
 			const children = fs.readdirSync(path.join(extensionsRoot, extensionFolder));
 			const packageNLSPath = children.filter(child => child === 'package.nls.json')[0];
 			const packageNLS = packageNLSPath ? JSON.parse(fs.readFileSync(path.join(extensionsRoot, extensionFolder, packageNLSPath)).toString()) : undefined;
-			let browserNlsMetadataPath: string | undefined;
-			if (packageJSON.browser) {
-				const browserEntrypointFolderPath = path.join(extensionFolder, path.dirname(packageJSON.browser));
-				if (fs.existsSync(path.join(extensionsRoot, browserEntrypointFolderPath, 'nls.metadata.json'))) {
-					browserNlsMetadataPath = path.join(browserEntrypointFolderPath, 'nls.metadata.json');
-				}
-			}
 			const readme = children.filter(child => /^readme(\.txt|\.md|)$/i.test(child))[0];
 			const changelog = children.filter(child => /^changelog(\.txt|\.md|)$/i.test(child))[0];
 
 			scannedExtensions.push({
 				extensionPath: extensionFolder,
 				packageJSON,
 				packageNLS,
-				browserNlsMetadataPath,
 				readmePath: readme ? path.join(extensionFolder, readme) : undefined,
 				changelogPath: changelog ? path.join(extensionFolder, changelog) : undefined,
 			});

build/lib/i18n.resources.json

@@ -154,6 +154,10 @@
 			"name": "vs/workbench/contrib/notebook",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/interactiveEditor",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/interactiveSession",
 			"project": "vscode-workbench"