fix dependency issue

src/vs/editor/browser/editor.all.ts

@@ -32,7 +32,7 @@ import 'vs/editor/contrib/links/browser/links';
 import 'vs/editor/contrib/multicursor/common/multicursor';
 import 'vs/editor/contrib/multicursor/browser/menuPreventer';
 import 'vs/editor/contrib/parameterHints/browser/parameterHints';
-import 'vs/editor/contrib/quickFix/browser/quickFix';
+import 'vs/editor/contrib/quickFix/browser/quickFixCommands';
 import 'vs/editor/contrib/referenceSearch/browser/referenceSearch';
 import 'vs/editor/contrib/rename/browser/rename';
 import 'vs/editor/contrib/smartSelect/common/smartSelect';

src/vs/editor/contrib/quickFix/browser/quickFix.ts

@@ -4,139 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as nls from 'vs/nls';
-import URI from 'vs/base/common/uri';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { IModelService } from 'vs/editor/common/services/modelService';
-import { ICommonCodeEditor, EditorContextKeys, ModeContextKeys, IEditorContribution, IReadOnlyModel } from 'vs/editor/common/editorCommon';
+import { IReadOnlyModel } from 'vs/editor/common/editorCommon';
 import { Range } from 'vs/editor/common/core/range';
-import { editorAction, ServicesAccessor, EditorAction, CommonEditorRegistry } from 'vs/editor/common/editorCommonExtensions';
-import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { editorContribution } from 'vs/editor/browser/editorBrowserExtensions';
 import { CodeAction, CodeActionProviderRegistry } from 'vs/editor/common/modes';
 import { asWinJsPromise } from 'vs/base/common/async';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { onUnexpectedExternalError, illegalArgument } from 'vs/base/common/errors';
-import { QuickFixContextMenu } from './quickFixWidget';
-import { LightBulbWidget } from './lightBulbWidget';
-import { QuickFixModel, QuickFixComputeEvent } from './quickFixModel';
-
-@editorContribution
-export class QuickFixController implements IEditorContribution {
-
-	private static ID = 'editor.contrib.quickFixController';
-
-	public static get(editor: ICommonCodeEditor): QuickFixController {
-		return editor.getContribution<QuickFixController>(QuickFixController.ID);
-	}
-
-	private _editor: ICodeEditor;
-	private _model: QuickFixModel;
-	private _quickFixContextMenu: QuickFixContextMenu;
-	private _lightBulbWidget: LightBulbWidget;
-	private _disposables: IDisposable[] = [];
-
-	constructor(editor: ICodeEditor,
-		@IMarkerService markerService: IMarkerService,
-		@IContextKeyService contextKeyService: IContextKeyService,
-		@ICommandService commandService: ICommandService,
-		@IContextMenuService contextMenuService: IContextMenuService,
-		@IKeybindingService private _keybindingService: IKeybindingService
-	) {
-		this._editor = editor;
-		this._model = new QuickFixModel(this._editor, markerService);
-		this._quickFixContextMenu = new QuickFixContextMenu(editor, contextMenuService, commandService);
-		this._lightBulbWidget = new LightBulbWidget(editor);
-
-		this._updateLightBulbTitle();
-
-		this._disposables.push(
-			this._quickFixContextMenu.onDidExecuteCodeAction(_ => this._model.trigger('auto')),
-			this._lightBulbWidget.onClick(this._handleLightBulbSelect, this),
-			this._model.onDidChangeFixes(e => this._onQuickFixEvent(e)),
-			this._keybindingService.onDidUpdateKeybindings(this._updateLightBulbTitle, this)
-		);
-	}
-
-	public dispose(): void {
-		this._model.dispose();
-		dispose(this._disposables);
-	}
-
-	private _onQuickFixEvent(e: QuickFixComputeEvent): void {
-		if (e && e.type === 'manual') {
-			this._quickFixContextMenu.show(e.fixes, e.position);
-
-		} else if (e && e.fixes) {
-			// auto magically triggered
-			// * update an existing list of code actions
-			// * manage light bulb
-			if (this._quickFixContextMenu.isVisible) {
-				this._quickFixContextMenu.show(e.fixes, e.position);
-			} else {
-				this._lightBulbWidget.model = e;
-			}
-		} else {
-			this._lightBulbWidget.hide();
-		}
-	}
-
-	public getId(): string {
-		return QuickFixController.ID;
-	}
-
-	private _handleLightBulbSelect(coords: { x: number, y: number }): void {
-		this._quickFixContextMenu.show(this._lightBulbWidget.model.fixes, coords);
-	}
-
-	public triggerFromEditorSelection(): void {
-		this._model.trigger('manual');
-	}
-
-	private _updateLightBulbTitle(): void {
-		const kb = this._keybindingService.lookupKeybinding(QuickFixAction.Id);
-		let title: string;
-		if (kb) {
-			title = nls.localize('quickFixWithKb', "Show Fixes ({0})", kb.getLabel());
-		} else {
-			title = nls.localize('quickFix', "Show Fixes");
-		}
-		this._lightBulbWidget.title = title;
-	}
-}
-
-@editorAction
-export class QuickFixAction extends EditorAction {
-
-	static Id = 'editor.action.quickFix';
-
-	constructor() {
-		super({
-			id: QuickFixAction.Id,
-			label: nls.localize('quickfix.trigger.label', "Quick Fix"),
-			alias: 'Quick Fix',
-			precondition: ContextKeyExpr.and(EditorContextKeys.Writable, ModeContextKeys.hasCodeActionsProvider),
-			kbOpts: {
-				kbExpr: EditorContextKeys.TextFocus,
-				primary: KeyMod.CtrlCmd | KeyCode.US_DOT
-			}
-		});
-	}
-
-	public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): void {
-		let controller = QuickFixController.get(editor);
-		if (controller) {
-			controller.triggerFromEditorSelection();
-		}
-	}
-}
-
+import { onUnexpectedExternalError } from 'vs/base/common/errors';
 
 export function getCodeActions(model: IReadOnlyModel, range: Range): TPromise<CodeAction[]> {
 
@@ -154,17 +27,3 @@ export function getCodeActions(model: IReadOnlyModel, range: Range): TPromise<Co
 	return TPromise.join(promises).then(() => allResults);
 }
 
-CommonEditorRegistry.registerLanguageCommand('_executeCodeActionProvider', function (accessor, args) {
-
-	const { resource, range } = args;
-	if (!(resource instanceof URI) || !Range.isIRange(range)) {
-		throw illegalArgument();
-	}
-
-	const model = accessor.get(IModelService).getModel(resource);
-	if (!model) {
-		throw illegalArgument();
-	}
-
-	return getCodeActions(model, model.validateRange(range));
-});

src/vs/editor/contrib/quickFix/browser/quickFixCommands.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as nls from 'vs/nls';
+import URI from 'vs/base/common/uri';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { IMarkerService } from 'vs/platform/markers/common/markers';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { ICommonCodeEditor, EditorContextKeys, ModeContextKeys, IEditorContribution, IReadOnlyModel } from 'vs/editor/common/editorCommon';
+import { Range } from 'vs/editor/common/core/range';
+import { editorAction, ServicesAccessor, EditorAction, CommonEditorRegistry } from 'vs/editor/common/editorCommonExtensions';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { editorContribution } from 'vs/editor/browser/editorBrowserExtensions';
+import { CodeAction, CodeActionProviderRegistry } from 'vs/editor/common/modes';
+import { asWinJsPromise } from 'vs/base/common/async';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { onUnexpectedExternalError, illegalArgument } from 'vs/base/common/errors';
+import { QuickFixContextMenu } from './quickFixWidget';
+import { LightBulbWidget } from './lightBulbWidget';
+import { QuickFixModel, QuickFixComputeEvent } from './quickFixModel';
+
+@editorContribution
+export class QuickFixController implements IEditorContribution {
+
+	private static ID = 'editor.contrib.quickFixController';
+
+	public static get(editor: ICommonCodeEditor): QuickFixController {
+		return editor.getContribution<QuickFixController>(QuickFixController.ID);
+	}
+
+	private _editor: ICodeEditor;
+	private _model: QuickFixModel;
+	private _quickFixContextMenu: QuickFixContextMenu;
+	private _lightBulbWidget: LightBulbWidget;
+	private _disposables: IDisposable[] = [];
+
+	constructor(editor: ICodeEditor,
+		@IMarkerService markerService: IMarkerService,
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@ICommandService commandService: ICommandService,
+		@IContextMenuService contextMenuService: IContextMenuService,
+		@IKeybindingService private _keybindingService: IKeybindingService
+	) {
+		this._editor = editor;
+		this._model = new QuickFixModel(this._editor, markerService);
+		this._quickFixContextMenu = new QuickFixContextMenu(editor, contextMenuService, commandService);
+		this._lightBulbWidget = new LightBulbWidget(editor);
+
+		this._updateLightBulbTitle();
+
+		this._disposables.push(
+			this._quickFixContextMenu.onDidExecuteCodeAction(_ => this._model.trigger('auto')),
+			this._lightBulbWidget.onClick(this._handleLightBulbSelect, this),
+			this._model.onDidChangeFixes(e => this._onQuickFixEvent(e)),
+			this._keybindingService.onDidUpdateKeybindings(this._updateLightBulbTitle, this)
+		);
+	}
+
+	public dispose(): void {
+		this._model.dispose();
+		dispose(this._disposables);
+	}
+
+	private _onQuickFixEvent(e: QuickFixComputeEvent): void {
+		if (e && e.type === 'manual') {
+			this._quickFixContextMenu.show(e.fixes, e.position);
+
+		} else if (e && e.fixes) {
+			// auto magically triggered
+			// * update an existing list of code actions
+			// * manage light bulb
+			if (this._quickFixContextMenu.isVisible) {
+				this._quickFixContextMenu.show(e.fixes, e.position);
+			} else {
+				this._lightBulbWidget.model = e;
+			}
+		} else {
+			this._lightBulbWidget.hide();
+		}
+	}
+
+	public getId(): string {
+		return QuickFixController.ID;
+	}
+
+	private _handleLightBulbSelect(coords: { x: number, y: number }): void {
+		this._quickFixContextMenu.show(this._lightBulbWidget.model.fixes, coords);
+	}
+
+	public triggerFromEditorSelection(): void {
+		this._model.trigger('manual');
+	}
+
+	private _updateLightBulbTitle(): void {
+		const kb = this._keybindingService.lookupKeybinding(QuickFixAction.Id);
+		let title: string;
+		if (kb) {
+			title = nls.localize('quickFixWithKb', "Show Fixes ({0})", kb.getLabel());
+		} else {
+			title = nls.localize('quickFix', "Show Fixes");
+		}
+		this._lightBulbWidget.title = title;
+	}
+}
+
+@editorAction
+export class QuickFixAction extends EditorAction {
+
+	static Id = 'editor.action.quickFix';
+
+	constructor() {
+		super({
+			id: QuickFixAction.Id,
+			label: nls.localize('quickfix.trigger.label', "Quick Fix"),
+			alias: 'Quick Fix',
+			precondition: ContextKeyExpr.and(EditorContextKeys.Writable, ModeContextKeys.hasCodeActionsProvider),
+			kbOpts: {
+				kbExpr: EditorContextKeys.TextFocus,
+				primary: KeyMod.CtrlCmd | KeyCode.US_DOT
+			}
+		});
+	}
+
+	public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): void {
+		let controller = QuickFixController.get(editor);
+		if (controller) {
+			controller.triggerFromEditorSelection();
+		}
+	}
+}
+
+
+export function getCodeActions(model: IReadOnlyModel, range: Range): TPromise<CodeAction[]> {
+
+	const allResults: CodeAction[] = [];
+	const promises = CodeActionProviderRegistry.all(model).map(support => {
+		return asWinJsPromise(token => support.provideCodeActions(model, range, token)).then(result => {
+			if (Array.isArray(result)) {
+				allResults.push(...result);
+			}
+		}, err => {
+			onUnexpectedExternalError(err);
+		});
+	});
+
+	return TPromise.join(promises).then(() => allResults);
+}
+
+CommonEditorRegistry.registerLanguageCommand('_executeCodeActionProvider', function (accessor, args) {
+
+	const { resource, range } = args;
+	if (!(resource instanceof URI) || !Range.isIRange(range)) {
+		throw illegalArgument();
+	}
+
+	const model = accessor.get(IModelService).getModel(resource);
+	if (!model) {
+		throw illegalArgument();
+	}
+
+	return getCodeActions(model, model.validateRange(range));
+});