Merge remote-tracking branch 'origin/main' into pr/CGNonofr/146522

.devcontainer/README.md

@@ -1,28 +1,28 @@
 # Code - OSS Development Container
 
-[![Open in Remote - Containers](https://img.shields.io/static/v1?label=Remote%20-%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
+[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
 
 This repository includes configuration for a development container for working with Code - OSS in a local container or using [GitHub Codespaces](https://github.com/features/codespaces).
 
 > **Tip:** The default VNC password is `vscode`. The VNC server runs on port `5901` and a web client is available on port `6080`.
 
 ## Quick start - local
 
-If you already have VS Code and Docker installed, you can click the badge above or [here](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) to get started. Clicking these links will cause VS Code to automatically install the Remote - Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use.
+If you already have VS Code and Docker installed, you can click the badge above or [here](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode) to get started. Clicking these links will cause VS Code to automatically install the Dev Containers extension if needed, clone the source code into a container volume, and spin up a dev container for use.
 
 1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
 
-2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**.
+2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build with **9 GB of RAM** being recommended. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**.
 
     > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar.
 
-3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Remote - Containers](https://aka.ms/vscode-remote/download/containers) extension.
+3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Dev Containers](https://aka.ms/vscode-remote/download/containers) extension.
 
-    ![Image of Remote - Containers extension](https://microsoft.github.io/vscode-remote-release/images/remote-containers-extn.png)
+    ![Image of Dev Containers extension](https://microsoft.github.io/vscode-remote-release/images/dev-containers-extn.png)
 
-    > **Note:** The Remote - Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details.
+    > **Note:** The Dev Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details.
 
-4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Remote-Containers: Clone Repository in Container Volume...**.
+4. Press <kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or <kbd>F1</kbd> and select **Dev Containers: Clone Repository in Container Volume...**.
 
     > **Tip:** While you can use your local source tree instead, operations like `yarn install` can be slow on macOS or when using the Hyper-V engine on Windows. We recommend the "clone repository in container" approach instead since it uses "named volume" rather than the local filesystem.
 

.devcontainer/devcontainer.json

@@ -6,9 +6,18 @@
 	"overrideCommand": false,
 	"runArgs": [ "--init", "--security-opt", "seccomp=unconfined", "--shm-size=1g"],
 
-	"settings": {
-		"resmon.show.battery": false,
-		"resmon.show.cpufreq": false
+	// VS Code extensions and settings
+	"customizations": {
+		"vscode": {
+			"settings": {
+				"resmon.show.battery": false,
+				"resmon.show.cpufreq": false
+			},
+			"extensions": [
+				"dbaeumer.vscode-eslint",
+				"mutantdino.resourcemonitor"
+			]
+		}
 	},
 
 	// noVNC, VNC
@@ -24,17 +33,12 @@
 		}
 	},
 
-	"extensions": [
-		"dbaeumer.vscode-eslint",
-		"mutantdino.resourcemonitor"
-	],
-
 	// Optionally loads a cached yarn install for the repo
 	"postCreateCommand": ".devcontainer/cache/restore-diff.sh",
 
 	"remoteUser": "node",
 
 	"hostRequirements": {
-		"memory": "8gb"
+		"memory": "9gb"
 	}
 }

.eslintignore

@@ -6,12 +6,16 @@
 **/extensions/css-language-features/server/test/pathCompletionFixtures/**
 **/extensions/html-language-features/server/lib/jquery.d.ts
 **/extensions/html-language-features/server/src/test/pathCompletionFixtures/**
+**/extensions/ipynb/notebook-out/**
 **/extensions/markdown-language-features/media/**
 **/extensions/markdown-language-features/notebook-out/**
 **/extensions/markdown-math/notebook-out/**
 **/extensions/notebook-renderers/renderer-out/index.js
 **/extensions/simple-browser/media/index.js
 **/extensions/typescript-language-features/test-workspace/**
+**/extensions/typescript-language-features/extension.webpack.config.js
+**/extensions/typescript-language-features/extension-browser.webpack.config.js
+**/extensions/typescript-language-features/web/**
 **/extensions/vscode-api-tests/testWorkspace/**
 **/extensions/vscode-api-tests/testWorkspace2/**
 **/fixtures/**
@@ -25,10 +29,7 @@
 **/src/typings/**/*.d.ts
 **/src/vs/*/**/*.d.ts
 **/src/vs/base/test/common/filters.perf.data.js
-**/src/vs/css.build.js
-**/src/vs/css.js
 **/src/vs/loader.js
-**/src/vs/nls.build.js
-**/src/vs/nls.js
 **/test/unit/assert.js
+**/test/automation/out/**
 **/typings/**

.eslintplugin/code-declare-service-brand.ts

@@ -0,0 +1,27 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 DeclareServiceBrand implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		fixable: 'code'
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		return {
+			['PropertyDefinition[key.name="_serviceBrand"][value]']: (node: any) => {
+				return context.report({
+					node,
+					message: `The '_serviceBrand'-property should not have a value`,
+					fix: (fixer) => {
+						return fixer.replaceText(node, 'declare _serviceBrand: undefined;')
+					}
+				});
+			}
+		};
+	}
+};

build/lib/eslint/code-import-patterns.ts → .eslintplugin/code-import-patterns.ts

@@ -6,10 +6,10 @@
 import * as eslint from 'eslint';
 import { TSESTree } from '@typescript-eslint/experimental-utils';
 import * as path from 'path';
-import * as minimatch from 'minimatch';
+import minimatch from 'minimatch';
 import { createImportRuleListener } from './utils';
 
-const REPO_ROOT = path.normalize(path.join(__dirname, '../../../'));
+const REPO_ROOT = path.normalize(path.join(__dirname, '../'));
 
 interface ConditionalPattern {
 	when?: 'hasBrowser' | 'hasNode' | 'test';

build/lib/eslint/code-no-look-behind-regex.ts → .eslintplugin/code-no-look-behind-regex.ts

@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as eslint from 'eslint';
 import { TSESTree } from '@typescript-eslint/experimental-utils';
 import * as ESTree from 'estree';

build/lib/eslint/code-no-unexternalized-strings.ts → .eslintplugin/code-no-unexternalized-strings.ts

@@ -51,7 +51,7 @@ export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
 				key = keyNode.value;
 
 			} else if (keyNode.type === AST_NODE_TYPES.ObjectExpression) {
-				for (let property of keyNode.properties) {
+				for (const property of keyNode.properties) {
 					if (property.type === AST_NODE_TYPES.Property && !property.computed) {
 						if (property.key.type === AST_NODE_TYPES.Identifier && property.key.name === 'key') {
 							if (isStringLiteral(property.value)) {
@@ -85,6 +85,27 @@ export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
 			}
 		}
 
+		function visitL10NCall(node: TSESTree.CallExpression) {
+
+			// localize(key, message)
+			const [messageNode] = (<TSESTree.CallExpression>node).arguments;
+
+			// remove message-argument from doubleQuoted list and make
+			// sure it is a string-literal
+			if (isStringLiteral(messageNode)) {
+				doubleQuotedStringLiterals.delete(messageNode);
+			} else if (messageNode.type === AST_NODE_TYPES.ObjectExpression) {
+				for (const prop of messageNode.properties) {
+					if (prop.type === AST_NODE_TYPES.Property) {
+						if (prop.key.type === AST_NODE_TYPES.Identifier && prop.key.name === 'message') {
+							doubleQuotedStringLiterals.delete(prop.value);
+							break;
+						}
+					}
+				}
+			}
+		}
+
 		function reportBadStringsAndBadKeys() {
 			// (1)
 			// report all strings that are in double quotes
@@ -97,7 +118,7 @@ export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
 				// (2)
 				// report all invalid NLS keys
 				if (!key.match(NoUnexternalizedStrings._rNlsKeys)) {
-					for (let value of values) {
+					for (const value of values) {
 						context.report({ loc: value.call.loc, messageId: 'badKey', data: { key } });
 					}
 				}
@@ -117,7 +138,16 @@ export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
 		return {
 			['Literal']: (node: any) => collectDoubleQuotedStrings(node),
 			['ExpressionStatement[directive] Literal:exit']: (node: any) => doubleQuotedStringLiterals.delete(node),
+
+			// localize(...)
 			['CallExpression[callee.type="MemberExpression"][callee.object.name="nls"][callee.property.name="localize"]:exit']: (node: any) => visitLocalizeCall(node),
+
+			// vscode.l10n.t(...)
+			['CallExpression[callee.type="MemberExpression"][callee.object.property.name="l10n"][callee.property.name="t"]:exit']: (node: any) => visitL10NCall(node),
+
+			// l10n.t(...)
+			['CallExpression[callee.object.name="l10n"][callee.property.name="t"]:exit']: (node: any) => visitL10NCall(node),
+
 			['CallExpression[callee.name="localize"][arguments.length>=2]:exit']: (node: any) => visitLocalizeCall(node),
 			['Program:exit']: reportBadStringsAndBadKeys,
 		};

build/lib/eslint/code-no-unused-expressions.ts → .eslintplugin/code-no-unused-expressions.ts

@@ -11,8 +11,6 @@
  * @author Michael Ficarra
  */
 
-'use strict';
-
 import * as eslint from 'eslint';
 import { TSESTree } from '@typescript-eslint/experimental-utils';
 import * as ESTree from 'estree';

.eslintplugin/index.js

@@ -0,0 +1,12 @@
+const glob = require('glob');
+const path = require('path');
+
+require('ts-node').register({ experimentalResolver: true, transpileOnly: true });
+
+// Re-export all .ts files as rules
+const rules = {};
+glob.sync(`${__dirname}/*.ts`).forEach((file) => {
+	rules[path.basename(file, '.ts')] = require(file);
+});
+
+exports.rules = rules;

.eslintplugin/tsconfig.json

@@ -0,0 +1,26 @@
+{
+	"compilerOptions": {
+		"target": "es2020",
+		"lib": [
+			"ES2020"
+		],
+		"module": "commonjs",
+		"esModuleInterop": true,
+		"alwaysStrict": true,
+		"allowJs": true,
+		"strict": true,
+		"exactOptionalPropertyTypes": false,
+		"useUnknownInCatchVariables": false,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"newLine": "lf",
+		"noEmit": true
+	},
+	"include": [
+		"**/*.ts",
+		"**/*.js"
+	],
+	"exclude": [
+		"node_modules/**"
+	]
+}

build/lib/eslint/vscode-dts-cancellation.ts → .eslintplugin/vscode-dts-cancellation.ts

@@ -20,7 +20,7 @@ export = new class ApiProviderNaming implements eslint.Rule.RuleModule {
 			['TSInterfaceDeclaration[id.name=/.+Provider/] TSMethodSignature[key.name=/^(provide|resolve).+/]']: (node: any) => {
 
 				let found = false;
-				for (let param of (<TSESTree.TSMethodSignature>node).params) {
+				for (const param of (<TSESTree.TSMethodSignature>node).params) {
 					if (param.type === AST_NODE_TYPES.Identifier) {
 						found = found || param.name === 'token';
 					}

build/lib/eslint/vscode-dts-event-naming.ts → .eslintplugin/vscode-dts-event-naming.ts

@@ -88,11 +88,10 @@ export = new class ApiEventNaming implements eslint.Rule.RuleModule {
 
 		if (def.type === AST_NODE_TYPES.Identifier) {
 			return def;
-		} else if ((def.type === AST_NODE_TYPES.TSPropertySignature || def.type === AST_NODE_TYPES.Property) && def.key.type === AST_NODE_TYPES.Identifier) {
+		} else if ((def.type === AST_NODE_TYPES.TSPropertySignature || def.type === AST_NODE_TYPES.PropertyDefinition) && def.key.type === AST_NODE_TYPES.Identifier) {
 			return def.key;
 		}
 
 		return this.getIdent(def.parent);
 	}
 };
-