Merge branch 'main' into terminal-si-help-duration-199170

Author: Tyriar

.eslintplugin/code-ensure-no-disposables-leak-in-test.ts

@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Node } from 'estree';
+
+export = new class EnsureNoDisposablesAreLeakedInTestSuite implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		type: 'problem',
+		messages: {
+			ensure: 'Suites should include a call to `ensureNoDisposablesAreLeakedInTestSuite()` to ensure no disposables are leaked in tests.'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		const config = <{ exclude: string[] }>context.options[0];
+
+		const needle = context.getFilename().replace(/\\/g, '/');
+		if (config.exclude.some((e) => needle.endsWith(e))) {
+			return {};
+		}
+
+		return {
+			[`Program > ExpressionStatement > CallExpression[callee.name='suite']`]: (node: Node) => {
+				const src = context.getSourceCode().getText(node)
+				if (!src.includes('ensureNoDisposablesAreLeakedInTestSuite(')) {
+					context.report({
+						node,
+						messageId: 'ensure',
+					});
+				}
+			},
+		};
+	}
+};

.eslintplugin/code-must-use-super-dispose.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 NoAsyncSuite implements eslint.Rule.RuleModule {
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		function doesCallSuperDispose(node: any) {
+
+			if (!node.override) {
+				return;
+			}
+
+			const body = context.getSourceCode().getText(node)
+
+			if (body.includes('super.dispose')) {
+				return;
+			}
+
+			context.report({
+				node,
+				message: 'dispose() should call super.dispose()'
+			});
+		}
+
+		return {
+			['MethodDefinition[override][key.name="dispose"]']: doesCallSuperDispose,
+		};
+	}
+};

.eslintrc.json

@@ -73,6 +73,7 @@
 		"local/code-no-nls-in-standalone-editor": "warn",
 		"local/code-no-standalone-editor": "warn",
 		"local/code-no-unexternalized-strings": "warn",
+		"local/code-must-use-super-dispose": "warn",
 		"local/code-declare-service-brand": "warn",
 		"local/code-layering": [
 			"warn",
@@ -119,6 +120,7 @@
 				"**/*.test.ts"
 			],
 			"rules": {
+				"local/code-must-use-super-dispose": "off",
 				"local/code-no-test-only": "error",
 				"local/code-no-test-async-suite": "warn",
 				"local/code-no-unexternalized-strings": "off",
@@ -136,6 +138,52 @@
 				]
 			}
 		},
+		{
+			"files": [
+				"src/vs/**/*.test.ts"
+			],
+			"rules": {
+				"local/code-ensure-no-disposables-leak-in-test": [
+					"warn",
+					{
+						// Files should (only) be removed from the list they adopt the leak detector
+						"exclude": [
+							"src/vs/base/test/browser/browser.test.ts",
+							"src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts",
+							"src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts",
+							"src/vs/editor/contrib/codeAction/test/browser/codeActionModel.test.ts",
+							"src/vs/editor/test/common/services/languageService.test.ts",
+							"src/vs/editor/test/node/classification/typescript.test.ts",
+							"src/vs/editor/test/node/diffing/defaultLinesDiffComputer.test.ts",
+							"src/vs/editor/test/node/diffing/fixtures.test.ts",
+							"src/vs/platform/configuration/test/common/configuration.test.ts",
+							"src/vs/platform/extensions/test/common/extensionValidator.test.ts",
+							"src/vs/platform/opener/test/common/opener.test.ts",
+							"src/vs/platform/registry/test/common/platform.test.ts",
+							"src/vs/platform/remote/test/common/remoteHosts.test.ts",
+							"src/vs/platform/telemetry/test/browser/1dsAppender.test.ts",
+							"src/vs/platform/workspace/test/common/workspace.test.ts",
+							"src/vs/platform/workspaces/test/electron-main/workspaces.test.ts",
+							"src/vs/workbench/api/test/browser/mainThreadConfiguration.test.ts",
+							"src/vs/workbench/api/test/common/extHostExtensionActivator.test.ts",
+							"src/vs/workbench/api/test/node/extHostTunnelService.test.ts",
+							"src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts",
+							"src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts",
+							"src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts",
+							"src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts",
+							"src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts",
+							"src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts",
+							"src/vs/workbench/contrib/tasks/test/common/problemMatcher.test.ts",
+							"src/vs/workbench/contrib/tasks/test/common/taskConfiguration.test.ts",
+							"src/vs/workbench/services/commands/test/common/commandService.test.ts",
+							"src/vs/workbench/services/extensions/test/common/extensionDescriptionRegistry.test.ts",
+							"src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts",
+							"src/vs/workbench/test/browser/quickAccess.test.ts"
+						]
+					}
+				]
+			}
+		},
 		{
 			"files": [
 				"**/vscode.d.ts",

.github/classifier.json

@@ -39,7 +39,7 @@
 		"editor-autoindent": {"assign": ["rebornix"]},
 		"editor-bracket-matching": {"assign": ["hediet"]},
 		"editor-clipboard": {"assign": ["alexdima", "rebornix"]},
-		"editor-code-actions": {"assign": ["mjbvz"]},
+		"editor-code-actions": {"assign": ["mjbvz", "justschen"]},
 		"editor-color-picker": {"assign": ["aiday-mar"]},
 		"editor-columnselect": {"assign": ["alexdima"]},
 		"editor-commands": {"assign": ["alexdima"]},
@@ -111,7 +111,7 @@
 		"interactive-window": {"assign": ["amunger", "rebornix"]},
 		"ipc": {"assign": ["joaomoreno"]},
 		"issue-bot": {"assign": ["chrmarti"]},
-		"issue-reporter": {"assign": ["TylerLeonhardt"]},
+		"issue-reporter": {"assign": ["justschen"]},
 		"javascript": {"assign": ["mjbvz"]},
 		"json": {"assign": ["aeschli"]},
 		"json-sorting": {"assign": ["aiday-mar"]},
@@ -253,6 +253,7 @@
 		"tokenization": {"assign": ["alexdima"]},
 		"touch/pointer": {"assign": []},
 		"trackpad/scroll": {"assign": []},
+		"tree-sticky-scroll": {"assign": ["benibenj"]},
 		"tree-views": {"assign": ["alexr00"]},
 		"tree-widget": {"assign": ["joaomoreno"]},
 		"typehierarchy": {"assign": ["jrieken"]},
@@ -272,6 +273,7 @@
 		"webview": {"assign": ["mjbvz"]},
 		"webview-views": {"assign": ["mjbvz"]},
 		"workbench-actions": {"assign": ["bpasero"]},
+		"workbench-auxwindow": {"assign": ["bpasero"]},
 		"workbench-banner": {"assign": ["lszomoru", "sbatten"]},
 		"workbench-cli": {"assign": ["bpasero"]},
 		"workbench-diagnostics": {"assign": ["Tyriar"]},

.github/workflows/basic.yml

@@ -29,7 +29,7 @@ jobs:
           sudo update-rc.d xvfb defaults
           sudo service xvfb start
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
 
@@ -38,7 +38,7 @@ jobs:
         run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
       - name: Cache node modules
         id: cacheNodeModules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -48,7 +48,7 @@ jobs:
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
       - name: Cache yarn directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.yarnCacheDirPath.outputs.dir }}
           key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -61,7 +61,7 @@ jobs:
         run: yarn --frozen-lockfile --network-timeout 180000
 
       - name: Compile and Download
-        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64"
+        run: yarn npm-run-all --max-old-space-size=4095 -lp compile "electron x64"
 
       - name: Run Unit Tests
         id: electron-unit-tests
@@ -81,7 +81,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
 
@@ -90,7 +90,7 @@ jobs:
         run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
       - name: Cache node modules
         id: cacheNodeModules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -100,7 +100,7 @@ jobs:
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
       - name: Cache yarn directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.yarnCacheDirPath.outputs.dir }}
           key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -143,7 +143,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version-file: .nvmrc
 
@@ -152,7 +152,7 @@ jobs:
         run: echo "value=$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)" >> $GITHUB_OUTPUT
       - name: Cache node modules
         id: cacheNodeModules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-cacheNodeModulesLinux-${{ steps.nodeModulesCacheKey.outputs.value }}
@@ -162,7 +162,7 @@ jobs:
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
       - name: Cache yarn directory
         if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.yarnCacheDirPath.outputs.dir }}
           key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}