Clean up dispose

mjbvz · mjbvz · commit e25528e2c2ae · 2018-06-15T11:08:22.000-07:00
diff --git a/src/vs/editor/contrib/codeAction/test/codeActionModel.test.ts b/src/vs/editor/contrib/codeAction/test/codeActionModel.test.ts
@@ -5,45 +5,49 @@
 'use strict';
 
 import * as assert from 'assert';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import URI from 'vs/base/common/uri';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { Selection } from 'vs/editor/common/core/selection';
 import { TextModel } from 'vs/editor/common/model/textModel';
+import { CodeActionProviderRegistry, LanguageIdentifier } from 'vs/editor/common/modes';
+import { CodeActionOracle } from 'vs/editor/contrib/codeAction/codeActionModel';
+import { CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
 import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
 import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { CodeActionOracle } from 'vs/editor/contrib/codeAction/codeActionModel';
-import { CodeActionProviderRegistry, LanguageIdentifier } from 'vs/editor/common/modes';
-import { IDisposable } from 'vs/base/common/lifecycle';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { Selection } from 'vs/editor/common/core/selection';
 
+const testProvider = {
+	provideCodeActions() {
+		return [{ id: 'test-command', title: 'test', arguments: [] }];
+	}
+};
 suite('CodeAction', () => {
 
 	const languageIdentifier = new LanguageIdentifier('foo-lang', 3);
 	let uri = URI.parse('untitled:path');
 	let model: TextModel;
 	let markerService: MarkerService;
 	let editor: ICodeEditor;
-	let reg: IDisposable;
+	let disposables: IDisposable[];
 
 	setup(() => {
-		reg = CodeActionProviderRegistry.register(languageIdentifier.language, {
-			provideCodeActions() {
-				return [{ id: 'test-command', title: 'test', arguments: [] }];
-			}
-		});
+		disposables = [];
 		markerService = new MarkerService();
 		model = TextModel.createFromString('foobar  foo bar\nfarboo far boo', undefined, languageIdentifier, uri);
 		editor = createTestCodeEditor({ model: model });
 		editor.setPosition({ lineNumber: 1, column: 1 });
 	});
 
 	teardown(() => {
-		reg.dispose();
+		dispose(disposables);
 		editor.dispose();
 		model.dispose();
 		markerService.dispose();
 	});
 
 	test('Orcale -> marker added', done => {
+		const reg = CodeActionProviderRegistry.register(languageIdentifier.language, testProvider);
+		disposables.push(reg);
 
 		const oracle = new CodeActionOracle(editor, markerService, e => {
 			assert.equal(e.trigger.type, 'auto');
@@ -68,6 +72,8 @@ suite('CodeAction', () => {
 	});
 
 	test('Orcale -> position changed', () => {
+		const reg = CodeActionProviderRegistry.register(languageIdentifier.language, testProvider);
+		disposables.push(reg);
 
 		markerService.changeOne('fake', uri, [{
 			startLineNumber: 1, startColumn: 1, endLineNumber: 1, endColumn: 6,
@@ -96,11 +102,12 @@ suite('CodeAction', () => {
 	});
 
 	test('Lightbulb is in the wrong place, #29933', async function () {
-		let reg = CodeActionProviderRegistry.register(languageIdentifier.language, {
-			provideCodeActions(doc, _range) {
+		const reg = CodeActionProviderRegistry.register(languageIdentifier.language, {
+			provideCodeActions(_doc, _range) {
 				return [];
 			}
 		});
+		disposables.push(reg);
 
 		editor.getModel().setValue('// @ts-check\n2\ncon\n');
 
@@ -146,9 +153,5 @@ suite('CodeAction', () => {
 
 		// 	oracle.trigger('manual');
 		// });
-
-
-		reg.dispose();
 	});
-
 });
