Merge branch 'main' into merogge/screen-inline

Author: meganrogge

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

.vscode/notebooks/my-work.github-issues

@@ -82,7 +82,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode is:open assignee:@me label:triage-needed\n"
+    "value": "$REPOS is:open assignee:@me label:triage-needed\n"
   },
   {
     "kind": 1,

build/azure-pipelines/cli/install-rust-posix.yml

@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.73.0
+    default: 1.77
   - name: targets
     default: []
     type: object

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

@@ -1,7 +1,7 @@
 parameters:
   - name: channel
     type: string
-    default: 1.73.0
+    default: 1.77
   - name: targets
     default: []
     type: object

build/azure-pipelines/product-build.yml

@@ -197,6 +197,7 @@ extends:
       - stage: Compile
         jobs:
           - job: Compile
+            timeoutInMinutes: 90
             pool:
               name: 1es-ubuntu-20.04-x64
               os: linux

build/lib/stylelint/vscode-known-variables.json

@@ -11,12 +11,12 @@
 		"--vscode-activityBar-inactiveForeground",
 		"--vscode-activityBarBadge-background",
 		"--vscode-activityBarBadge-foreground",
+		"--vscode-activityBarTop-activeBackground",
 		"--vscode-activityBarTop-activeBorder",
+		"--vscode-activityBarTop-background",
 		"--vscode-activityBarTop-dropBorder",
 		"--vscode-activityBarTop-foreground",
 		"--vscode-activityBarTop-inactiveForeground",
-		"--vscode-activityBarTop-background",
-		"--vscode-activityBarTop-activeBackground",
 		"--vscode-badge-background",
 		"--vscode-badge-foreground",
 		"--vscode-banner-background",
@@ -261,6 +261,10 @@
 		"--vscode-editorMarkerNavigationInfo-headerBackground",
 		"--vscode-editorMarkerNavigationWarning-background",
 		"--vscode-editorMarkerNavigationWarning-headerBackground",
+		"--vscode-editorMultiCursor-primary-background",
+		"--vscode-editorMultiCursor-primary-foreground",
+		"--vscode-editorMultiCursor-secondary-background",
+		"--vscode-editorMultiCursor-secondary-foreground",
 		"--vscode-editorOverviewRuler-addedForeground",
 		"--vscode-editorOverviewRuler-background",
 		"--vscode-editorOverviewRuler-border",
@@ -487,6 +491,9 @@
 		"--vscode-panelTitle-activeBorder",
 		"--vscode-panelTitle-activeForeground",
 		"--vscode-panelTitle-inactiveForeground",
+		"--vscode-panelStickyScroll-background",
+		"--vscode-panelStickyScroll-border",
+		"--vscode-panelStickyScroll-shadow",
 		"--vscode-peekView-border",
 		"--vscode-peekViewEditor-background",
 		"--vscode-peekViewEditor-matchHighlightBackground",
@@ -557,11 +564,15 @@
 		"--vscode-sideBar-border",
 		"--vscode-sideBar-dropBackground",
 		"--vscode-sideBar-foreground",
+		"--vscode-sideBarActivityBarTop-border",
 		"--vscode-sideBarSectionHeader-background",
 		"--vscode-sideBarSectionHeader-border",
 		"--vscode-sideBarSectionHeader-foreground",
+		"--vscode-sideBarTitle-background",
 		"--vscode-sideBarTitle-foreground",
-		"--vscode-sideBarActivityBarTop-border",
+		"--vscode-sideBarStickyScroll-background",
+		"--vscode-sideBarStickyScroll-border",
+		"--vscode-sideBarStickyScroll-shadow",
 		"--vscode-sideBySideEditor-horizontalBorder",
 		"--vscode-sideBySideEditor-verticalBorder",
 		"--vscode-simpleFindWidget-sashBorder",
@@ -702,11 +713,17 @@
 		"--vscode-testing-coveredBorder",
 		"--vscode-testing-coveredGutterBackground",
 		"--vscode-testing-iconErrored",
+		"--vscode-testing-iconErrored-retired",
 		"--vscode-testing-iconFailed",
+		"--vscode-testing-iconFailed-retired",
 		"--vscode-testing-iconPassed",
+		"--vscode-testing-iconPassed-retired",
 		"--vscode-testing-iconQueued",
+		"--vscode-testing-iconQueued-retired",
 		"--vscode-testing-iconSkipped",
+		"--vscode-testing-iconSkipped-retired",
 		"--vscode-testing-iconUnset",
+		"--vscode-testing-iconUnset-retired",
 		"--vscode-testing-message-error-decorationForeground",
 		"--vscode-testing-message-error-lineBackground",
 		"--vscode-testing-message-info-decorationForeground",
@@ -720,7 +737,6 @@
 		"--vscode-testing-uncoveredBorder",
 		"--vscode-testing-uncoveredBranchBackground",
 		"--vscode-testing-uncoveredGutterBackground",
-		"--vscode-testing-uncoveredGutterBackground",
 		"--vscode-textBlockQuote-background",
 		"--vscode-textBlockQuote-border",
 		"--vscode-textCodeBlock-background",

cli/Cargo.lock

@@ -229,9 +229,12 @@ pub struct CommandShellArgs {
 	/// Listen on a socket instead of stdin/stdout.
 	#[clap(long)]
 	pub on_socket: bool,
-	/// Listen on a port instead of stdin/stdout.
+	/// Listen on a host/port instead of stdin/stdout.
 	#[clap(long, num_args = 0..=1, default_missing_value = "0")]
 	pub on_port: Option<u16>,
+	/// Listen on a host/port instead of stdin/stdout.
+	#[clap[long]]
+	pub on_host: Option<String>,
 	/// Require the given token string to be given in the handshake.
 	#[clap(long, env = "VSCODE_CLI_REQUIRE_TOKEN")]
 	pub require_token: Option<String>,