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

Only catch errors on request

Browse Source
This commit is contained in:
Matt Bierner
2018-06-04 08:55:24 -07:00
parent 7f74bb7526
commit 45a79e010f
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
extensions/typescript-language-features/src/features/refactorProvider.ts
View File

@@ -135,39 +135,41 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
await this.formattingOptionsManager.ensureConfigurationForDocument(document, undefined);
const args: Proto.GetApplicableRefactorsRequestArgs = typeConverters.Range.toFileRangeRequestArgs(file, rangeOrSelection);
let response: Proto.GetApplicableRefactorsResponse;
try {
const response = await this.client.execute('getApplicableRefactors', args, token);
response = await this.client.execute('getApplicableRefactors', args, token);
if (!response || !response.body) {
return [];
}
const actions: vscode.CodeAction[] = [];
for (const info of response.body) {
if (info.inlineable === false) {
const codeAction = new vscode.CodeAction(info.description, vscode.CodeActionKind.Refactor);
codeAction.command = {
title: info.description,
command: SelectRefactorCommand.ID,
arguments: [document, file, info, rangeOrSelection]
};
actions.push(codeAction);
} else {
for (const action of info.actions) {
const codeAction = new vscode.CodeAction(action.description, TypeScriptRefactorProvider.getKind(action));
codeAction.command = {
title: action.description,
command: ApplyRefactoringCommand.ID,
arguments: [document, file, info.name, action.name, rangeOrSelection]
};
actions.push(codeAction);
}
}
}
return actions;
} catch {
return [];
}
const actions: vscode.CodeAction[] = [];
for (const info of response.body) {
if (info.inlineable === false) {
const codeAction = new vscode.CodeAction(info.description, vscode.CodeActionKind.Refactor);
codeAction.command = {
title: info.description,
command: SelectRefactorCommand.ID,
arguments: [document, file, info, rangeOrSelection]
};
actions.push(codeAction);
} else {
for (const action of info.actions) {
const codeAction = new vscode.CodeAction(action.description, TypeScriptRefactorProvider.getKind(action));
codeAction.command = {
title: action.description,
command: ApplyRefactoringCommand.ID,
arguments: [document, file, info.name, action.name, rangeOrSelection]
};
actions.push(codeAction);
}
}
}
return actions;
}
private static getKind(refactor: Proto.RefactorActionInfo) {