debt - adopt ensureNoDisposablesAreLeakedInTestSuite in more tests (#…

…200116)

* debt - adopt `ensureNoDisposablesAreLeakedInTestSuite` in more tests

* .

* .

* .

.eslintrc.json

@@ -149,18 +149,13 @@
 							"src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts",
 							"src/vs/base/test/browser/browser.test.ts",
 							"src/vs/base/test/browser/comparers.test.ts",
-							"src/vs/base/test/browser/dom.test.ts",
-							"src/vs/base/test/browser/formattedTextRenderer.test.ts",
 							"src/vs/base/test/browser/hash.test.ts",
-							"src/vs/base/test/browser/iconLabels.test.ts",
 							"src/vs/base/test/browser/indexedDB.test.ts",
-							"src/vs/base/test/browser/ui/contextview/contextview.test.ts",
 							"src/vs/base/test/browser/ui/menu/menubar.test.ts",
 							"src/vs/base/test/browser/ui/scrollbar/scrollableElement.test.ts",
 							"src/vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts",
 							"src/vs/base/test/common/arrays.test.ts",
 							"src/vs/base/test/common/arraysFind.test.ts",
-							"src/vs/base/test/common/assert.test.ts",
 							"src/vs/base/test/common/cache.test.ts",
 							"src/vs/base/test/common/charCode.test.ts",
 							"src/vs/base/test/common/collections.test.ts",
@@ -178,13 +173,11 @@
 							"src/vs/base/test/common/jsonFormatter.test.ts",
 							"src/vs/base/test/common/keybindings.test.ts",
 							"src/vs/base/test/common/keyCodes.test.ts",
-							"src/vs/base/test/common/lazy.test.ts",
 							"src/vs/base/test/common/linkedList.test.ts",
 							"src/vs/base/test/common/linkedText.test.ts",
 							"src/vs/base/test/common/map.test.ts",
 							"src/vs/base/test/common/markdownString.test.ts",
 							"src/vs/base/test/common/marshalling.test.ts",
-							"src/vs/base/test/common/mime.test.ts",
 							"src/vs/base/test/common/naturalLanguage/korean.test.ts",
 							"src/vs/base/test/common/network.test.ts",
 							"src/vs/base/test/common/normalization.test.ts",
@@ -195,7 +188,6 @@
 							"src/vs/base/test/common/resourceTree.test.ts",
 							"src/vs/base/test/common/scrollable.test.ts",
 							"src/vs/base/test/common/skipList.test.ts",
-							"src/vs/base/test/common/strings.test.ts",
 							"src/vs/base/test/common/stripComments.test.ts",
 							"src/vs/base/test/common/ternarySearchtree.test.ts",
 							"src/vs/base/test/common/types.test.ts",
@@ -205,9 +197,7 @@
 							"src/vs/base/test/node/css.build.test.ts",
 							"src/vs/base/test/node/id.test.ts",
 							"src/vs/base/test/node/nodeStreams.test.ts",
-							"src/vs/base/test/node/port.test.ts",
 							"src/vs/base/test/node/snapshot.test.ts",
-							"src/vs/base/test/node/unc.test.ts",
 							"src/vs/code/test/electron-sandbox/issue/testReporterModel.test.ts",
 							"src/vs/editor/contrib/codeAction/test/browser/codeActionKeybindingResolver.test.ts",
 							"src/vs/editor/contrib/codeAction/test/browser/codeActionModel.test.ts",
@@ -233,10 +223,6 @@
 							"src/vs/platform/contextkey/test/common/contextkey.test.ts",
 							"src/vs/platform/contextkey/test/common/parser.test.ts",
 							"src/vs/platform/contextkey/test/common/scanner.test.ts",
-							"src/vs/platform/dialogs/test/common/dialog.test.ts",
-							"src/vs/platform/environment/test/node/argv.test.ts",
-							"src/vs/platform/environment/test/node/userDataPath.test.ts",
-							"src/vs/platform/extensionManagement/test/common/configRemotes.test.ts",
 							"src/vs/platform/extensionManagement/test/common/extensionManagement.test.ts",
 							"src/vs/platform/extensions/test/common/extensionValidator.test.ts",
 							"src/vs/platform/externalTerminal/electron-main/externalTerminalService.test.ts",
@@ -251,24 +237,19 @@
 							"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/telemetry/test/browser/telemetryService.test.ts",
 							"src/vs/platform/telemetry/test/common/telemetryLogAppender.test.ts",
-							"src/vs/platform/undoRedo/test/common/undoRedoService.test.ts",
 							"src/vs/platform/userDataSync/test/common/extensionsMerge.test.ts",
 							"src/vs/platform/userDataSync/test/common/globalStateMerge.test.ts",
 							"src/vs/platform/userDataSync/test/common/settingsMerge.test.ts",
 							"src/vs/platform/userDataSync/test/common/snippetsMerge.test.ts",
 							"src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts",
 							"src/vs/platform/workspace/test/common/workspace.test.ts",
-							"src/vs/platform/workspaces/test/common/workspaces.test.ts",
 							"src/vs/platform/workspaces/test/electron-main/workspaces.test.ts",
 							"src/vs/server/test/node/serverConnectionToken.test.ts",
-							"src/vs/workbench/api/test/browser/extHost.api.impl.test.ts",
 							"src/vs/workbench/api/test/browser/extHostApiCommands.test.ts",
 							"src/vs/workbench/api/test/browser/extHostBulkEdits.test.ts",
 							"src/vs/workbench/api/test/browser/extHostCommands.test.ts",
 							"src/vs/workbench/api/test/browser/extHostDocumentSaveParticipant.test.ts",
-							"src/vs/workbench/api/test/browser/extHostMessagerService.test.ts",
 							"src/vs/workbench/api/test/browser/extHostTelemetry.test.ts",
 							"src/vs/workbench/api/test/browser/extHostTextEditor.test.ts",
 							"src/vs/workbench/api/test/browser/extHostTypeConverter.test.ts",
@@ -294,9 +275,7 @@
 							"src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts",
 							"src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts",
 							"src/vs/workbench/contrib/files/test/browser/explorerFileNestingTrie.test.ts",
-							"src/vs/workbench/contrib/files/test/browser/explorerModel.test.ts",
 							"src/vs/workbench/contrib/files/test/browser/explorerView.test.ts",
-							"src/vs/workbench/contrib/files/test/browser/fileActions.test.ts",
 							"src/vs/workbench/contrib/notebook/test/browser/cellDnd.test.ts",
 							"src/vs/workbench/contrib/notebook/test/browser/contrib/contributedStatusBarItemController.test.ts",
 							"src/vs/workbench/contrib/notebook/test/browser/contrib/executionStatusBarItem.test.ts",
@@ -311,15 +290,12 @@
 							"src/vs/workbench/contrib/snippets/test/browser/snippetFile.test.ts",
 							"src/vs/workbench/contrib/snippets/test/browser/snippetsRegistry.test.ts",
 							"src/vs/workbench/contrib/snippets/test/browser/snippetsRewrite.test.ts",
-							"src/vs/workbench/contrib/tags/test/node/workspaceTags.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/contrib/terminal/test/browser/terminalActions.test.ts",
-							"src/vs/workbench/contrib/themes/test/node/colorRegistryExport.test.ts",
 							"src/vs/workbench/contrib/welcomeGettingStarted/test/browser/gettingStartedMarkdownRenderer.test.ts",
 							"src/vs/workbench/services/commands/test/common/commandService.test.ts",
 							"src/vs/workbench/services/configuration/test/common/configurationModels.test.ts",
-							"src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts",
 							"src/vs/workbench/services/dialogs/test/electron-sandbox/fileDialogService.test.ts",
 							"src/vs/workbench/services/editor/test/browser/editorResolverService.test.ts",
 							"src/vs/workbench/services/extensions/test/common/extensionDescriptionRegistry.test.ts",
@@ -337,16 +313,12 @@
 							"src/vs/workbench/services/search/test/common/searchHelpers.test.ts",
 							"src/vs/workbench/services/search/test/node/ripgrepFileSearch.test.ts",
 							"src/vs/workbench/services/search/test/node/ripgrepTextSearchEngineUtils.test.ts",
-							"src/vs/workbench/services/search/test/node/textSearchManager.test.ts",
 							"src/vs/workbench/services/telemetry/test/browser/commonProperties.test.ts",
-							"src/vs/workbench/services/textfile/test/common/textFileService.io.test.ts",
-							"src/vs/workbench/services/textMate/test/browser/arrayOperation.test.ts",
 							"src/vs/workbench/services/themes/test/node/tokenStyleResolving.test.ts",
 							"src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts",
 							"src/vs/workbench/services/workspaces/test/browser/workspaces.test.ts",
 							"src/vs/workbench/services/workspaces/test/common/workspaceTrust.test.ts",
-							"src/vs/workbench/test/browser/quickAccess.test.ts",
-							"src/vs/workbench/test/browser/webview.test.ts"
+							"src/vs/workbench/test/browser/quickAccess.test.ts"
 						]
 					}
 				]

.github/classifier.json

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

src/vs/base/test/browser/dom.test.ts

@@ -8,6 +8,7 @@ import { $, asCssValueWithDefault, h, multibyteAwareBtoa, trackAttributes, copyA
 import { ensureCodeWindow, isAuxiliaryWindow, mainWindow } from 'vs/base/browser/window';
 import { DeferredPromise, timeout } from 'vs/base/common/async';
 import { runWithFakedTimers } from 'vs/base/test/common/timeTravelScheduler';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('dom', () => {
 	test('hasClass', () => {
@@ -404,4 +405,6 @@ suite('dom', () => {
 			assert.strictEqual(count, 0);
 		});
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/base/test/browser/formattedTextRenderer.test.ts

@@ -6,6 +6,7 @@
 import * as assert from 'assert';
 import { renderFormattedText, renderText } from 'vs/base/browser/formattedTextRenderer';
 import { DisposableStore } from 'vs/base/common/lifecycle';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('FormattedTextRenderer', () => {
 	const store = new DisposableStore();
@@ -127,4 +128,6 @@ suite('FormattedTextRenderer', () => {
 		assert.strictEqual(result.children.length, 0);
 		assert.strictEqual(result.innerHTML, '**bold**');
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/base/test/browser/iconLabels.test.ts

@@ -5,6 +5,7 @@
 
 import * as assert from 'assert';
 import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('renderLabelWithIcons', () => {
 
@@ -49,4 +50,6 @@ suite('renderLabelWithIcons', () => {
 			.map(elem => elem instanceof HTMLElement ? elem.outerHTML : elem)
 			.reduce((a, b) => a + b, '');
 	};
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/base/test/browser/ui/contextview/contextview.test.ts

@@ -5,6 +5,7 @@
 
 import * as assert from 'assert';
 import { layout, LayoutAnchorPosition } from 'vs/base/browser/ui/contextview/contextview';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('Contextview', function () {
 
@@ -25,4 +26,6 @@ suite('Contextview', function () {
 		assert.strictEqual(layout(200, 20, { offset: 50, size: 50, position: LayoutAnchorPosition.After }), 30);
 		assert.strictEqual(layout(200, 20, { offset: 150, size: 50, position: LayoutAnchorPosition.After }), 130);
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/base/test/common/assert.test.ts

@@ -5,6 +5,7 @@
 
 import * as assert from 'assert';
 import { ok } from 'vs/base/common/assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('Assert', () => {
 	test('ok', () => {
@@ -31,4 +32,6 @@ suite('Assert', () => {
 		ok({});
 		ok(5);
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/base/test/common/iconLabels.test.ts

@@ -6,6 +6,7 @@
 import * as assert from 'assert';
 import { IMatch } from 'vs/base/common/filters';
 import { escapeIcons, getCodiconAriaLabel, IParsedLabelWithIcons, markdownEscapeEscapedIcons, matchesFuzzyIconAware, parseLabelWithIcons, stripIcons } from 'vs/base/common/iconLabels';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 interface IIconFilter {
 	// Returns null if word doesn't match.
@@ -110,4 +111,6 @@ suite('Icon Labels', () => {
 		assert.strictEqual(markdownEscapeEscapedIcons('$(Hello) World'), '$(Hello) World');
 		assert.strictEqual(markdownEscapeEscapedIcons('\\$(Hello) World'), '\\\\$(Hello) World');
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/base/test/common/lazy.test.ts

@@ -5,6 +5,7 @@
 
 import * as assert from 'assert';
 import { Lazy } from 'vs/base/common/lazy';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('Lazy', () => {
 
@@ -27,4 +28,6 @@ suite('Lazy', () => {
 		assert.strictEqual(value.hasValue, true);
 		assert.throws(() => value.value, /\b1\b/);
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/base/test/common/mime.test.ts

@@ -5,6 +5,7 @@
 
 import * as assert from 'assert';
 import { normalizeMimeType } from 'vs/base/common/mime';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('Mime', () => {
 
@@ -16,4 +17,6 @@ suite('Mime', () => {
 		assert.strictEqual(normalizeMimeType('Text/plain;UPPER'), 'text/plain;UPPER');
 		assert.strictEqual(normalizeMimeType('Text/plain;lower'), 'text/plain;lower');
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/base/test/common/strings.test.ts

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
 import * as strings from 'vs/base/common/strings';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('Strings', () => {
 	test('equalsIgnoreCase', () => {
@@ -510,4 +511,6 @@ suite('Strings', () => {
 			assert.strictEqual(strings.removeAnsiEscapeCodes(`hello${sequence}world`), 'helloworld', `expect to remove ${JSON.stringify(sequence)}`);
 		}
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/base/test/node/port.test.ts

@@ -6,6 +6,7 @@
 import * as assert from 'assert';
 import * as net from 'net';
 import * as ports from 'vs/base/node/ports';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { flakySuite } from 'vs/base/test/node/testUtils';
 
 flakySuite('Ports', () => {
@@ -29,4 +30,6 @@ flakySuite('Ports', () => {
 			});
 		}, err => done(err));
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/base/test/node/unc.test.ts

@@ -5,6 +5,7 @@
 
 import { strictEqual } from 'assert';
 import { getUNCHost } from 'vs/base/node/unc';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 suite('UNC', () => {
 
@@ -43,4 +44,6 @@ suite('UNC', () => {
 		strictEqual(getUNCHost('\\\\.\\UNC\\localhost\\a'), 'localhost');
 		strictEqual(getUNCHost('\\\\?\\UNC\\localhost\\a'), 'localhost');
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/platform/dialogs/test/common/dialog.test.ts

@@ -5,6 +5,7 @@
 
 import { deepEqual } from 'assert';
 import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { IMassagedMessageBoxOptions, massageMessageBoxOptions } from 'vs/platform/dialogs/common/dialogs';
 import product from 'vs/platform/product/common/product';
 import { IProductService } from 'vs/platform/product/common/productService';
@@ -139,4 +140,6 @@ suite('Dialog', () => {
 			assertOptions(fourButtonNegativeCancel, ['4', '3', '2', '1'], 3, -1, [3, 2, 1, 0]);
 		}
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/platform/environment/test/node/argv.test.ts

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { formatOptions, Option, OptionDescriptions, Subcommand, parseArgs, ErrorReporter } from 'vs/platform/environment/node/argv';
 import { addArg } from 'vs/platform/environment/node/argvHelper';
 
@@ -81,6 +82,8 @@ suite('formatOptions', () => {
 				'      A test command'
 			]);
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });
 
 suite('parseArgs', () => {
@@ -156,4 +159,6 @@ suite('parseArgs', () => {
 			[]
 		);
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/platform/environment/test/node/userDataPath.test.ts

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { OPTIONS, parseArgs } from 'vs/platform/environment/node/argv';
 import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
 import product from 'vs/platform/product/common/product';
@@ -57,4 +58,6 @@ suite('User data path', () => {
 			}
 		}
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/platform/extensionManagement/test/common/configRemotes.test.ts

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { getDomainsOfRemotes, getRemotes } from 'vs/platform/extensionManagement/common/configRemotes';
 
 suite('Config Remotes', () => {
@@ -127,4 +128,6 @@ suite('Config Remotes', () => {
 	fetch = +refs/heads/*:refs/remotes/origin/*
 `;
 	}
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

src/vs/platform/telemetry/test/browser/telemetryService.test.ts

@@ -8,6 +8,7 @@ import * as sinonTest from 'sinon-test';
 import { mainWindow } from 'vs/base/browser/window';
 import * as Errors from 'vs/base/common/errors';
 import { Emitter } from 'vs/base/common/event';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import product from 'vs/platform/product/common/product';
 import { IProductService } from 'vs/platform/product/common/productService';
@@ -741,4 +742,6 @@ suite('TelemetryService', () => {
 
 		service.dispose();
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });