add ensureNoDisposablesAreLeakedInTestSuite() to tests

.eslintrc.json

@@ -151,15 +151,13 @@
 							"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/codeActionKeybindingResolver.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/keybinding/test/common/keybindingLabels.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",
@@ -179,9 +177,6 @@
 							"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/keybinding/test/node/fallbackKeyboardMapper.test.ts",
-							"src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts",
-							"src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts",
 							"src/vs/workbench/services/userActivity/test/browser/domActivityTracker.test.ts",
 							"src/vs/workbench/test/browser/quickAccess.test.ts"
 						]

src/vs/editor/contrib/codeAction/test/browser/codeActionKeybindingResolver.test.ts

@@ -7,6 +7,7 @@ import * as assert from 'assert';
 import { KeyCodeChord } from 'vs/base/common/keybindings';
 import { KeyCode } from 'vs/base/common/keyCodes';
 import { OperatingSystem } from 'vs/base/common/platform';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { organizeImportsCommandId, refactorCommandId } from 'vs/editor/contrib/codeAction/browser/codeAction';
 import { CodeActionKeybindingResolver } from 'vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver';
 import { CodeActionKind } from 'vs/editor/contrib/codeAction/common/types';
@@ -15,6 +16,9 @@ import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKe
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
 
 suite('CodeActionKeybindingResolver', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	const refactorKeybinding = createCodeActionKeybinding(
 		KeyCode.KeyA,
 		refactorCommandId,

src/vs/platform/keybinding/test/common/keybindingLabels.test.ts

@@ -6,10 +6,13 @@
 import * as assert from 'assert';
 import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { OperatingSystem } from 'vs/base/common/platform';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { createUSLayoutResolvedKeybinding } from 'vs/platform/keybinding/test/common/keybindingsTestUtils';
 
 suite('KeybindingLabels', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	function assertUSLabel(OS: OperatingSystem, keybinding: number, expected: string): void {
 		const usResolvedKeybinding = createUSLayoutResolvedKeybinding(keybinding, OS)!;
 		assert.strictEqual(usResolvedKeybinding.getLabel(), expected);

src/vs/workbench/services/keybinding/test/node/fallbackKeyboardMapper.test.ts

@@ -6,11 +6,14 @@
 import { KeyChord, KeyCode, KeyMod, ScanCode } from 'vs/base/common/keyCodes';
 import { KeyCodeChord, decodeKeybinding, ScanCodeChord, Keybinding } from 'vs/base/common/keybindings';
 import { OperatingSystem } from 'vs/base/common/platform';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 import { FallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/fallbackKeyboardMapper';
 import { IResolvedKeybinding, assertResolveKeyboardEvent, assertResolveKeybinding } from 'vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils';
 
 suite('keyboardMapper - MAC fallback', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	const mapper = new FallbackKeyboardMapper(false, OperatingSystem.Macintosh);
 
 	function _assertResolveKeybinding(k: number, expected: IResolvedKeybinding[]): void {
@@ -229,6 +232,8 @@ suite('keyboardMapper - MAC fallback', () => {
 
 suite('keyboardMapper - LINUX fallback', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	const mapper = new FallbackKeyboardMapper(false, OperatingSystem.Linux);
 
 	function _assertResolveKeybinding(k: number, expected: IResolvedKeybinding[]): void {

src/vs/workbench/services/keybinding/test/node/macLinuxKeyboardMapper.test.ts

@@ -12,6 +12,7 @@ import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayo
 import { MacLinuxKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxKeyboardMapper';
 import { IResolvedKeybinding, assertMapping, assertResolveKeyboardEvent, assertResolveKeybinding, readRawMapping } from 'vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils';
 import { IMacLinuxKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 const WRITE_FILE_IF_DIFFERENT = false;
 
@@ -22,6 +23,8 @@ async function createKeyboardMapper(isUSStandard: boolean, file: string, mapAltG
 
 suite('keyboardMapper - MAC de_ch', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
@@ -401,6 +404,8 @@ suite('keyboardMapper - MAC de_ch', () => {
 
 suite('keyboardMapper - MAC en_us', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
@@ -515,6 +520,8 @@ suite('keyboardMapper - MAC en_us', () => {
 
 suite('keyboardMapper - LINUX de_ch', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
@@ -894,6 +901,8 @@ suite('keyboardMapper - LINUX de_ch', () => {
 
 suite('keyboardMapper - LINUX en_us', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
@@ -1532,6 +1541,8 @@ suite('keyboardMapper - LINUX en_us', () => {
 
 suite('keyboardMapper', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test('issue #23706: Linux UK layout: Ctrl + Apostrophe also toggles terminal', () => {
 		const mapper = new MacLinuxKeyboardMapper(false, {
 			'Backquote': {
@@ -1666,6 +1677,8 @@ suite('keyboardMapper', () => {
 
 suite('keyboardMapper - LINUX ru', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
@@ -1700,6 +1713,8 @@ suite('keyboardMapper - LINUX ru', () => {
 
 suite('keyboardMapper - LINUX en_uk', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
@@ -1740,6 +1755,8 @@ suite('keyboardMapper - LINUX en_uk', () => {
 
 suite('keyboardMapper - MAC zh_hant', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {
@@ -1774,6 +1791,8 @@ suite('keyboardMapper - MAC zh_hant', () => {
 
 suite('keyboardMapper - MAC zh_hant2', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: MacLinuxKeyboardMapper;
 
 	suiteSetup(async () => {

src/vs/workbench/services/keybinding/test/node/windowsKeyboardMapper.test.ts

@@ -9,6 +9,7 @@ import { OperatingSystem } from 'vs/base/common/platform';
 import { WindowsKeyboardMapper } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper';
 import { IResolvedKeybinding, assertMapping, assertResolveKeyboardEvent, assertResolveKeybinding, readRawMapping } from 'vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils';
 import { IWindowsKeyboardMapping } from 'vs/platform/keyboardLayout/common/keyboardLayout';
+import { ensureNoDisposablesAreLeakedInTestSuite } from 'vs/base/test/common/utils';
 
 const WRITE_FILE_IF_DIFFERENT = false;
 
@@ -24,6 +25,8 @@ function _assertResolveKeybinding(mapper: WindowsKeyboardMapper, k: number, expe
 
 suite('keyboardMapper - WINDOWS de_ch', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: WindowsKeyboardMapper;
 
 	suiteSetup(async () => {
@@ -338,6 +341,8 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
 
 suite('keyboardMapper - WINDOWS en_us', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: WindowsKeyboardMapper;
 
 	suiteSetup(async () => {
@@ -563,6 +568,8 @@ suite('keyboardMapper - WINDOWS en_us', () => {
 
 suite('keyboardMapper - WINDOWS por_ptb', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: WindowsKeyboardMapper;
 
 	suiteSetup(async () => {
@@ -628,6 +635,8 @@ suite('keyboardMapper - WINDOWS por_ptb', () => {
 
 suite('keyboardMapper - WINDOWS ru', () => {
 
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	let mapper: WindowsKeyboardMapper;
 
 	suiteSetup(async () => {
@@ -657,6 +666,9 @@ suite('keyboardMapper - WINDOWS ru', () => {
 });
 
 suite('keyboardMapper - misc', () => {
+
+	ensureNoDisposablesAreLeakedInTestSuite();
+
 	test('issue #23513: Toggle Sidebar Visibility and Go to Line display same key mapping in Arabic keyboard', () => {
 		const mapper = new WindowsKeyboardMapper(false, {
 			'KeyB': {