Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues

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

@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { ChordKeybinding, KeyCode, SimpleKeybinding } from 'vs/base/common/keyCodes';
+import { OperatingSystem } from 'vs/base/common/platform';
+import { refactorCommandId, organizeImportsCommandId } from 'vs/editor/contrib/codeAction/codeAction';
+import { CodeActionKind } from 'vs/editor/contrib/codeAction/types';
+import { CodeActionKeybindingResolver } from 'vs/editor/contrib/codeAction/codeActionMenu';
+import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
+import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
+
+suite('CodeActionKeybindingResolver', () => {
+	const refactorKeybinding = createCodeActionKeybinding(
+		KeyCode.KEY_A,
+		refactorCommandId,
+		{ kind: CodeActionKind.Refactor.value });
+
+	const refactorExtractKeybinding = createCodeActionKeybinding(
+		KeyCode.KEY_B,
+		refactorCommandId,
+		{ kind: CodeActionKind.Refactor.append('extract').value });
+
+	const organizeImportsKeybinding = createCodeActionKeybinding(
+		KeyCode.KEY_C,
+		organizeImportsCommandId,
+		undefined);
+
+	test('Should match refactor keybindings', async function () {
+		const resolver = new CodeActionKeybindingResolver({
+			getKeybindings: (): readonly ResolvedKeybindingItem[] => {
+				return [refactorKeybinding];
+			},
+		}).getResolver();
+
+		assert.equal(
+			resolver({ title: '' }),
+			undefined);
+
+		assert.equal(
+			resolver({ title: '', kind: CodeActionKind.Refactor.value }),
+			refactorKeybinding.resolvedKeybinding);
+
+		assert.equal(
+			resolver({ title: '', kind: CodeActionKind.Refactor.append('extract').value }),
+			refactorKeybinding.resolvedKeybinding);
+
+		assert.equal(
+			resolver({ title: '', kind: CodeActionKind.QuickFix.value }),
+			undefined);
+	});
+
+	test('Should prefer most specific keybinding', async function () {
+		const resolver = new CodeActionKeybindingResolver({
+			getKeybindings: (): readonly ResolvedKeybindingItem[] => {
+				return [refactorKeybinding, refactorExtractKeybinding, organizeImportsKeybinding];
+			},
+		}).getResolver();
+
+		assert.equal(
+			resolver({ title: '', kind: CodeActionKind.Refactor.value }),
+			refactorKeybinding.resolvedKeybinding);
+
+		assert.equal(
+			resolver({ title: '', kind: CodeActionKind.Refactor.append('extract').value }),
+			refactorExtractKeybinding.resolvedKeybinding);
+	});
+
+	test('Organize imports should still return a keybinding even though it does not have args', async function () {
+		const resolver = new CodeActionKeybindingResolver({
+			getKeybindings: (): readonly ResolvedKeybindingItem[] => {
+				return [refactorKeybinding, refactorExtractKeybinding, organizeImportsKeybinding];
+			},
+		}).getResolver();
+
+		assert.equal(
+			resolver({ title: '', kind: CodeActionKind.SourceOrganizeImports.value }),
+			organizeImportsKeybinding.resolvedKeybinding);
+	});
+});
+
+function createCodeActionKeybinding(keycode: KeyCode, command: string, commandArgs: any) {
+	return new ResolvedKeybindingItem(
+		new USLayoutResolvedKeybinding(
+			new ChordKeybinding([new SimpleKeybinding(false, true, false, false, keycode)]),
+			OperatingSystem.Linux),
+		command,
+		commandArgs,
+		undefined,
+		false);
+}
+