Merge remote-tracking branch 'origin/main' into rebornix/awake-lion

Author: rebornix

.configurations/configuration.dsc.yaml

@@ -0,0 +1,67 @@
+# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
+# Reference: https://github.com/microsoft/vscode/wiki/How-to-Contribute
+properties:
+  resources:
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      directives:
+        description: Install Git
+        allowPrerelease: true
+      settings:
+        id: Git.Git
+        source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: npm
+      directives:
+        description: Install NodeJS version >=16.17.x and <17
+        allowPrerelease: true
+      settings:
+        id: OpenJS.NodeJS.LTS
+        version: "16.20.0"
+        source: winget
+    - resource: NpmDsc/NpmPackage
+      id: yarn
+      dependsOn:
+        - npm
+      directives:
+        description: Install Yarn
+        allowPrerelease: true
+      settings:
+        Name: 'yarn'
+        Global: true
+        PackageDirectory: '${WinGetConfigRoot}\..\'
+    - 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
+      settings:
+        id: Microsoft.VisualStudio.2022.BuildTools
+        source: winget
+    - resource: Microsoft.VisualStudio.DSC/VSComponents
+      dependsOn:
+        - vsPackage
+      directives:
+        description: Install required VS workloads
+        allowPrerelease: true
+      settings:
+        productId: Microsoft.VisualStudio.Product.BuildTools
+        channelId: VisualStudio.17.Release
+        includeRecommended: true
+        components:
+          - Microsoft.VisualStudio.Workload.VCTools
+    - resource: YarnDsc/YarnInstall
+      dependsOn:
+        - npm
+      directives:
+        description: Install dependencies
+        allowPrerelease: true
+      settings:
+        PackageDirectory: '${WinGetConfigRoot}\..\'
+  configurationVersion: 0.2.0

.eslintplugin/code-amd-node-module.ts

@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 } from 'path';
+
+
+export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			amdX: 'Use `import type` for import declarations, use `amdX#importAMDNodeModule` for import expressions'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const modules = new Set<string>();
+
+		try {
+			const { dependencies, optionalDependencies } = require(join(__dirname, '../package.json'));
+			const all = Object.keys(dependencies).concat(Object.keys(optionalDependencies));
+			for (const key of all) {
+				modules.add(key);
+			}
+
+		} catch (e) {
+			console.error(e);
+			throw e;
+		}
+
+
+		const checkImport = (node: any) => {
+
+			if (node.type !== 'Literal' || typeof node.value !== 'string') {
+				return;
+			}
+
+			if (node.parent.importKind === 'type') {
+				return;
+			}
+
+			if (!modules.has(node.value)) {
+				return;
+			}
+
+			context.report({
+				node,
+				messageId: 'amdX'
+			});
+		}
+
+		return {
+			['ImportExpression Literal']: checkImport,
+			['ImportDeclaration Literal']: checkImport
+		};
+	}
+};

.eslintplugin/code-import-patterns.ts

@@ -18,7 +18,7 @@ interface ConditionalPattern {
 
 interface RawImportPatternsConfig {
 	target: string;
-	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-browser' | 'electron-main';
+	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-main';
 	test?: boolean;
 	restrictions: string | (string | ConditionalPattern)[];
 }
@@ -77,7 +77,7 @@ export = new class implements eslint.Rule.RuleModule {
 			return this._optionsCache.get(options)!;
 		}
 
-		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-browser' | 'electron-main';
+		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-main';
 
 		interface ILayerRule {
 			layer: Layer;
@@ -96,7 +96,6 @@ export = new class implements eslint.Rule.RuleModule {
 			{ layer: 'browser', deps: orSegment(['common', 'browser']), isBrowser: true },
 			{ layer: 'electron-sandbox', deps: orSegment(['common', 'browser', 'electron-sandbox']), isBrowser: true },
 			{ layer: 'node', deps: orSegment(['common', 'node']), isNode: true },
-			{ layer: 'electron-browser', deps: orSegment(['common', 'browser', 'node', 'electron-sandbox', 'electron-browser']), isBrowser: true, isNode: true },
 			{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-main']), isNode: true },
 		];
 
@@ -181,8 +180,9 @@ export = new class implements eslint.Rule.RuleModule {
 			const restrictions = (typeof option.restrictions === 'string' ? [option.restrictions] : option.restrictions).slice(0);
 
 			if (targetIsVS) {
-				// Always add "vs/nls"
+				// Always add "vs/nls" and "vs/amdX"
 				restrictions.push('vs/nls');
+				restrictions.push('vs/amdX'); // TODO@jrieken remove after ESM is real
 			}
 
 			if (targetIsVS && option.layer) {

.eslintplugin/code-no-native-private.ts

@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  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';
+
+export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			slow: 'Native private fields are much slower and should only be used when needed. Ignore this warning if you know what you are doing, use compile-time private otherwise. See https://github.com/microsoft/vscode/issues/185991#issuecomment-1614468158 for details',
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		return {
+			['PropertyDefinition PrivateIdentifier']: (node: any) => {
+				context.report({
+					node,
+					messageId: 'slow'
+				});
+			},
+			['MethodDefinition PrivateIdentifier']: (node: any) => {
+				context.report({
+					node,
+					messageId: 'slow'
+				});
+			}
+		};
+	}
+};

.eslintplugin/vscode-dts-string-type-literals.ts

@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TSESTree } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiTypeDiscrimination implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines' },
+		messages: {
+			noTypeDiscrimination: 'Do not use type descrimination properties'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		return {
+			['TSPropertySignature[optional=undefined] TSTypeAnnotation TSLiteralType Literal']: (node: any) => {
+
+				const raw = String((<TSESTree.Literal>node).raw)
+
+				if (/^('|").*\1$/.test(raw)) {
+
+					context.report({
+						node: node,
+						messageId: 'noTypeDiscrimination'
+					});
+				}
+			}
+		}
+	}
+};

.eslintrc.json

@@ -69,6 +69,7 @@
 			}
 		],
 		"local/code-translation-remind": "warn",
+		"local/code-no-native-private": "warn",
 		"local/code-no-nls-in-standalone-editor": "warn",
 		"local/code-no-standalone-editor": "warn",
 		"local/code-no-unexternalized-strings": "warn",
@@ -87,12 +88,6 @@
 					"common",
 					"browser"
 				],
-				"electron-browser": [
-					"common",
-					"browser",
-					"node",
-					"electron-sandbox"
-				],
 				"electron-main": [
 					"common",
 					"node"
@@ -136,6 +131,7 @@
 			"rules": {
 				"local/vscode-dts-create-func": "warn",
 				"local/vscode-dts-literal-or-types": "warn",
+				"local/vscode-dts-string-type-literals": "warn",
 				"local/vscode-dts-interface-naming": "warn",
 				"local/vscode-dts-cancellation": "warn",
 				"local/vscode-dts-use-thenable": "warn",
@@ -198,6 +194,14 @@
 				]
 			}
 		},
+		{
+			"files": [
+				"src/**/{common,browser}/**/*.ts"
+			],
+			"rules": {
+				"local/code-amd-node-module": "warn"
+			}
+		},
 		{
 			"files": [
 				"src/**/*.ts"
@@ -210,7 +214,6 @@
 						// imports that are allowed in all files of layers:
 						// - browser
 						// - electron-sandbox
-						// - electron-browser
 						"when": "hasBrowser",
 						"allow": [
 							"vs/css!./**/*"
@@ -219,7 +222,6 @@
 					{
 						// imports that are allowed in all files of layers:
 						// - node
-						// - electron-browser
 						// - electron-main
 						"when": "hasNode",
 						"allow": [
@@ -229,6 +231,9 @@
 							"@vscode/ripgrep",
 							"@vscode/iconv-lite-umd",
 							"@vscode/policy-watcher",
+							"@vscode/proxy-agent",
+							"@vscode/spdlog",
+							"@vscode/windows-process-tree",
 							"assert",
 							"child_process",
 							"console",
@@ -237,6 +242,7 @@
 							"electron",
 							"events",
 							"fs",
+							"fs/promises",
 							"graceful-fs",
 							"http",
 							"https",
@@ -248,21 +254,20 @@
 							"os",
 							"path",
 							"perf_hooks",
-							"spdlog",
+							"readline",
 							"stream",
 							"string_decoder",
 							"tas-client-umd",
 							"tls",
 							"url",
 							"util",
 							"v8-inspect-profiler",
-							"vscode-proxy-agent",
 							"vscode-regexpp",
 							"vscode-textmate",
-							"windows-process-tree",
 							"worker_threads",
 							"xterm",
 							"xterm-addon-canvas",
+							"xterm-addon-image",
 							"xterm-addon-search",
 							"xterm-addon-serialize",
 							"xterm-addon-unicode11",
@@ -297,14 +302,12 @@
 					//  - src/vs/base/browser
 					//  - src/vs/base/electron-sandbox
 					//  - src/vs/base/node
-					//  - src/vs/base/electron-browser
 					//  - src/vs/base/electron-main
 					//  - src/vs/base/test/common
 					//  - src/vs/base/test/worker
 					//  - src/vs/base/test/browser
 					//  - src/vs/base/test/electron-sandbox
 					//  - src/vs/base/test/node
-					//  - src/vs/base/test/electron-browser
 					//  - src/vs/base/test/electron-main
 					//
 					// When /~ is used in the restrictions, it will be replaced with the correct
@@ -601,6 +604,12 @@
 							"vs/workbench/workbench.common.main"
 						]
 					},
+					{
+						"target": "src/vs/amdX.ts",
+						"restrictions": [
+							"vs/base/common/*"
+						]
+					},
 					{
 						"target": "src/vs/workbench/{workbench.desktop.main.nls.js,workbench.web.main.nls.js}",
 						"restrictions": []

.git-blame-ignore

@@ -15,6 +15,9 @@ ae1452eea678f5266ef513f22dacebb90955d6c9
 # joaomoreno: add ghooks dev dependency
 0dfc06e0f9de5925de792cdf9f0e6597bb25908f
 
+# joaomoreno: line endings
+12ab70d329a13dd5b18d892cd40edd7138259bc3
+
 # mjbvz: organize imports
 494cbbd02d67e87727ec885f98d19551aa33aad1
 a3cb14be7f2cceadb17adf843675b1a59537dbbd

.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"]},