Merge branch 'microsoft:main' into fix/improve-marker-placements

Author: cpendery

.eslintignore

@@ -33,3 +33,4 @@
 **/test/unit/assert.js
 **/test/automation/out/**
 **/typings/**
+!.vscode

.eslintplugin/code-no-potentially-unsafe-disposables.ts

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  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';
+
+/**
+ * Checks for potentially unsafe usage of `DisposableStore` / `MutableDisposable`.
+ *
+ * These have been the source of leaks in the past.
+ */
+export = new class implements eslint.Rule.RuleModule {
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		function checkVariableDeclaration(inNode: any) {
+			context.report({
+				node: inNode,
+				message: `Use const for 'DisposableStore' to avoid leaks by accidental reassignment.`
+			});
+		}
+
+		function checkProperty(inNode: any) {
+			context.report({
+				node: inNode,
+				message: `Use readonly for DisposableStore/MutableDisposable to avoid leaks through accidental reassignment.`
+			});
+		}
+
+		return {
+			'VariableDeclaration[kind!="const"] NewExpression[callee.name="DisposableStore"]': checkVariableDeclaration,
+
+			'PropertyDefinition[readonly!=true][typeAnnotation.typeAnnotation.typeName.name=/DisposableStore|MutableDisposable/]': checkProperty,
+			'PropertyDefinition[readonly!=true] NewExpression[callee.name=/DisposableStore|MutableDisposable/]': checkProperty,
+		};
+	}
+};

.eslintplugin/code-parameter-properties-must-have-explicit-accessibility.ts

@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  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';
+
+/**
+ * Enforces that all parameter properties have an explicit access modifier (public, protected, private).
+ *
+ * This catches a common bug where a service is accidentally made public by simply writing: `readonly prop: Foo`
+ */
+export = new class implements eslint.Rule.RuleModule {
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		function check(inNode: any) {
+			const node: TSESTree.TSParameterProperty = inNode;
+
+			// For now, only apply to injected services
+			const firstDecorator = node.decorators?.at(0);
+			if (
+				firstDecorator?.expression.type !== 'Identifier'
+				|| !firstDecorator.expression.name.endsWith('Service')
+			) {
+				return;
+			}
+
+			if (!node.accessibility) {
+				context.report({
+					node: inNode,
+					message: 'Parameter properties must have an explicit access modifier.'
+				});
+			}
+		}
+
+		return {
+			['TSParameterProperty']: check,
+		};
+	}
+};

.eslintrc.json

@@ -70,7 +70,9 @@
 		],
 		"local/code-translation-remind": "warn",
 		"local/code-no-native-private": "warn",
+		"local/code-parameter-properties-must-have-explicit-accessibility": "warn",
 		"local/code-no-nls-in-standalone-editor": "warn",
+		"local/code-no-potentially-unsafe-disposables": "warn",
 		"local/code-no-standalone-editor": "warn",
 		"local/code-no-unexternalized-strings": "warn",
 		"local/code-must-use-super-dispose": "warn",
@@ -856,7 +858,11 @@
 							}, // TODO@layers
 							"tas-client-umd", // node module allowed even in /common/
 							"vscode-textmate", // node module allowed even in /common/
-							"@vscode/vscode-languagedetection" // node module allowed even in /common/
+							"@vscode/vscode-languagedetection", // node module allowed even in /common/
+							{
+								"when": "hasBrowser",
+								"pattern": "@xterm/xterm"
+							} // node module allowed even in /browser/
 						]
 					},
 					{

.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts

@@ -1,6 +1,7 @@
-/*---------------------------------------------------------
- * Copyright (C) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------*/
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 
 import { IstanbulCoverageContext } from 'istanbul-to-vscode';
 

.vscode/extensions/vscode-selfhost-test-provider/src/debounce.ts

@@ -1,6 +1,7 @@
-/*---------------------------------------------------------
- * Copyright (C) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------*/
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 
 /**
  * Debounces the function call for an interval.

.vscode/extensions/vscode-selfhost-test-provider/src/extension.ts

@@ -1,6 +1,7 @@
-/*---------------------------------------------------------
- * Copyright (C) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------*/
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 
 import { randomBytes } from 'crypto';
 import { tmpdir } from 'os';

.vscode/extensions/vscode-selfhost-test-provider/src/failingDeepStrictEqualAssertFixer.ts

@@ -1,6 +1,7 @@
-/*---------------------------------------------------------
- * Copyright (C) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------*/
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 
 import * as ts from 'typescript';
 import {
@@ -98,15 +99,15 @@ const formatJsonValue = (value: unknown) => {
     context => (node: ts.Node) => {
       const visitor = (node: ts.Node): ts.Node =>
         ts.isPropertyAssignment(node) &&
-        ts.isStringLiteralLike(node.name) &&
-        identifierLikeRe.test(node.name.text)
+          ts.isStringLiteralLike(node.name) &&
+          identifierLikeRe.test(node.name.text)
           ? ts.factory.createPropertyAssignment(
-              ts.factory.createIdentifier(node.name.text),
-              ts.visitNode(node.initializer, visitor) as ts.Expression
-            )
+            ts.factory.createIdentifier(node.name.text),
+            ts.visitNode(node.initializer, visitor) as ts.Expression
+          )
           : ts.isStringLiteralLike(node) && node.text === '[undefined]'
-          ? ts.factory.createIdentifier('undefined')
-          : ts.visitEachChild(node, visitor, context);
+            ? ts.factory.createIdentifier('undefined')
+            : ts.visitEachChild(node, visitor, context);
 
       return ts.visitNode(node, visitor);
     },
@@ -189,7 +190,7 @@ class StrictEqualAssertion {
     return undefined;
   }
 
-  constructor(private readonly expression: ts.CallExpression) {}
+  constructor(private readonly expression: ts.CallExpression) { }
 
   /** Gets the expected value */
   public get expectedValue(): ts.Expression | undefined {

.vscode/extensions/vscode-selfhost-test-provider/src/memoize.ts

@@ -1,6 +1,7 @@
-/*---------------------------------------------------------
- * Copyright (C) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------*/
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 
 export const memoizeLast = <A, T>(fn: (args: A) => T): ((args: A) => T) => {
   let last: { arg: A; result: T } | undefined;

.vscode/extensions/vscode-selfhost-test-provider/src/metadata.ts

@@ -1,6 +1,7 @@
-/*---------------------------------------------------------
- * Copyright (C) Microsoft Corporation. All rights reserved.
- *--------------------------------------------------------*/
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 import { TestMessage } from 'vscode';
 
 export interface TestMessageMetadata {