Merge VS Code 1.23.1 (#1520)

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

@@ -0,0 +1,197 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as assert from 'assert';
+import URI from 'vs/base/common/uri';
+import { TextModel } from 'vs/editor/common/model/textModel';
+import { CodeActionProviderRegistry, LanguageIdentifier, CodeActionProvider, Command, WorkspaceEdit, ResourceTextEdit, CodeAction, CodeActionContext } from 'vs/editor/common/modes';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { Range } from 'vs/editor/common/core/range';
+import { getCodeActions } from 'vs/editor/contrib/codeAction/codeAction';
+import { CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
+import { MarkerSeverity } from 'vs/platform/markers/common/markers';
+
+suite('CodeAction', () => {
+
+	let langId = new LanguageIdentifier('fooLang', 17);
+	let uri = URI.parse('untitled:path');
+	let model: TextModel;
+	let disposables: IDisposable[] = [];
+	let testData = {
+		diagnostics: {
+			abc: {
+				title: 'bTitle',
+				diagnostics: [{
+					startLineNumber: 1,
+					startColumn: 1,
+					endLineNumber: 2,
+					endColumn: 1,
+					severity: MarkerSeverity.Error,
+					message: 'abc'
+				}]
+			},
+			bcd: {
+				title: 'aTitle',
+				diagnostics: [{
+					startLineNumber: 1,
+					startColumn: 1,
+					endLineNumber: 2,
+					endColumn: 1,
+					severity: MarkerSeverity.Error,
+					message: 'bcd'
+				}]
+			}
+		},
+		command: {
+			abc: {
+				command: new class implements Command {
+					id: '1';
+					title: 'abc';
+				},
+				title: 'Extract to inner function in function "test"'
+			}
+		},
+		spelling: {
+			bcd: {
+				diagnostics: [],
+				edit: new class implements WorkspaceEdit {
+					edits: ResourceTextEdit[];
+				},
+				title: 'abc'
+			}
+		},
+		tsLint: {
+			abc: {
+				$ident: 57,
+				arguments: [],
+				id: '_internal_command_delegation',
+				title: 'abc'
+			},
+			bcd: {
+				$ident: 47,
+				arguments: [],
+				id: '_internal_command_delegation',
+				title: 'bcd'
+			}
+		}
+	};
+
+	setup(function () {
+		model = TextModel.createFromString('test1\ntest2\ntest3', undefined, langId, uri);
+		disposables = [model];
+	});
+
+	teardown(function () {
+		dispose(disposables);
+	});
+
+	test('CodeActions are sorted by type, #38623', async function () {
+
+		const provider = new class implements CodeActionProvider {
+			provideCodeActions() {
+				return [
+					testData.command.abc,
+					testData.diagnostics.bcd,
+					testData.spelling.bcd,
+					testData.tsLint.bcd,
+					testData.tsLint.abc,
+					testData.diagnostics.abc
+				];
+			}
+		};
+
+		disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
+
+		const expected = [
+			// CodeActions with a diagnostics array are shown first ordered by diagnostics.message
+			testData.diagnostics.abc,
+			testData.diagnostics.bcd,
+
+			// CodeActions without diagnostics are shown in the given order without any further sorting
+			testData.command.abc,
+			testData.spelling.bcd, // empty diagnostics array
+			testData.tsLint.bcd,
+			testData.tsLint.abc
+		];
+
+		const actions = await getCodeActions(model, new Range(1, 1, 2, 1));
+		assert.equal(actions.length, 6);
+		assert.deepEqual(actions, expected);
+	});
+
+	test('getCodeActions should filter by scope', async function () {
+		const provider = new class implements CodeActionProvider {
+			provideCodeActions(): CodeAction[] {
+				return [
+					{ title: 'a', kind: 'a' },
+					{ title: 'b', kind: 'b' },
+					{ title: 'a.b', kind: 'a.b' }
+				];
+			}
+		};
+
+		disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
+
+		{
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), { kind: new CodeActionKind('a') });
+			assert.equal(actions.length, 2);
+			assert.strictEqual(actions[0].title, 'a');
+			assert.strictEqual(actions[1].title, 'a.b');
+		}
+
+		{
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), { kind: new CodeActionKind('a.b') });
+			assert.equal(actions.length, 1);
+			assert.strictEqual(actions[0].title, 'a.b');
+		}
+
+		{
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), { kind: new CodeActionKind('a.b.c') });
+			assert.equal(actions.length, 0);
+		}
+	});
+
+	test('getCodeActions should forward requested scope to providers', async function () {
+		const provider = new class implements CodeActionProvider {
+			provideCodeActions(_model: any, _range: Range, context: CodeActionContext, _token: any): CodeAction[] {
+				return [
+					{ title: context.only, kind: context.only }
+				];
+			}
+		};
+
+		disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
+
+		const actions = await getCodeActions(model, new Range(1, 1, 2, 1), { kind: new CodeActionKind('a') });
+		assert.equal(actions.length, 1);
+		assert.strictEqual(actions[0].title, 'a');
+	});
+
+	test('getCodeActions should not return source code action by default', async function () {
+		const provider = new class implements CodeActionProvider {
+			provideCodeActions(): CodeAction[] {
+				return [
+					{ title: 'a', kind: CodeActionKind.Source.value },
+					{ title: 'b', kind: 'b' }
+				];
+			}
+		};
+
+		disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
+
+		{
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), {});
+			assert.equal(actions.length, 1);
+			assert.strictEqual(actions[0].title, 'b');
+		}
+
+		{
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), { kind: CodeActionKind.Source, includeSourceActions: true });
+			assert.equal(actions.length, 1);
+			assert.strictEqual(actions[0].title, 'a');
+		}
+	});
+});