Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 10:38:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use command manager for completion item provider

Browse Source
This commit is contained in:
Matt Bierner
2017-11-07 15:50:34 -08:00
parent 37c3cd1117
commit 5b7aa97bab
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
extensions/typescript/src/features/completionItemProvider.ts
View File

@@ -16,7 +16,7 @@ import { tsTextSpanToVsRange, vsPositionToTsFileLocation } from '../utils/conver
import * as nls from 'vscode-nls';
import { applyCodeAction } from '../utils/codeAction';
import * as languageModeIds from '../utils/languageModeIds';
import { CommandManager } from '../utils/commandManager';
import { CommandManager, Command } from '../utils/commandManager';
let localize = nls.loadMessageBundle();
@@ -126,6 +126,24 @@ class MyCompletionItem extends CompletionItem {
}
}
class ApplyCompletionCodeActionCommand implements Command {
public static readonly ID = '_typescript.applyCompletionCodeAction';
public readonly id = ApplyCompletionCodeActionCommand.ID;
public constructor(
private readonly client: ITypeScriptServiceClient
) { }
public async execute(file: string, codeActions: CodeAction[]): Promise<boolean> {
for (const action of codeActions) {
if (!(await applyCodeAction(this.client, action, file))) {
return false;
}
}
return true;
}
}
interface Configuration {
useCodeSnippetsOnMethodSuggest: boolean;
nameSuggestions: boolean;
@@ -142,16 +160,12 @@ namespace Configuration {
}
export default class TypeScriptCompletionItemProvider implements CompletionItemProvider {
private readonly commandId: string;
constructor(
private client: ITypeScriptServiceClient,
mode: string,
private readonly typingsStatus: TypingsStatus,
commandManager: CommandManager
) {
this.commandId = `_typescript.applyCompletionCodeAction.${mode}`;
commandManager.registerCommand(this.commandId, this.applyCompletionCodeAction, this);
commandManager.register(new ApplyCompletionCodeActionCommand(this.client));
}
public async provideCompletionItems(
@@ -313,7 +327,7 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
if (detail.codeActions && detail.codeActions.length) {
item.command = {
title: '',
command: this.commandId,
command: ApplyCompletionCodeActionCommand.ID,
arguments: [filepath, detail.codeActions]
};
}
@@ -380,16 +394,6 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
return new SnippetString(codeSnippet);
}
private async applyCompletionCodeAction(file: string, codeActions: CodeAction[]): Promise<boolean> {
for (const action of codeActions) {
if (!(await applyCodeAction(this.client, action, file))) {
return false;
}
}
return true;
}
private getConfiguration(resource: Uri): Configuration {
// Use shared setting for js and ts
const typeScriptConfig = workspace.getConfiguration('typescript', resource);

2
extensions/typescript/src/typescriptMain.ts
View File

@@ -233,7 +233,7 @@ class LanguageProvider {
const selector = this.description.modeIds;
const config = workspace.getConfiguration(this.id);
const completionItemProvider = new (await import('./features/completionItemProvider')).default(client, this.description.id, this.typingsStatus, this.commandManager);
const completionItemProvider = new (await import('./features/completionItemProvider')).default(client, this.typingsStatus, this.commandManager);
this.disposables.push(languages.registerCompletionItemProvider(selector, completionItemProvider, '.', '"', '\'', '/', '@'));
this.disposables.push(languages.registerCompletionItemProvider(selector, new (await import('./features/directiveCommentCompletionProvider')).default(client), '@'));