maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Hook up experimental TS refactor error

Browse source 
For https://github.com/microsoft/TypeScript/pull/37871
This commit is contained in:
Matt Bierner 2020-04-10 17:07:09 -07:00
parent be3df0a396
commit f3ceb33c5c
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
extensions/typescript-language-features/src/features/refactor.ts
View file

@ -19,6 +19,9 @@ import FormattingOptionsManager from './fileConfigurationManager';
const localize = nls.loadMessageBundle(); const localize = nls.loadMessageBundle();
interface RefactorActionInfo extends Proto.RefactorActionInfo {
error?: string
}
class ApplyRefactoringCommand implements Command { class ApplyRefactoringCommand implements Command {
public static readonly ID = '_typescript.applyRefactoring'; public static readonly ID = '_typescript.applyRefactoring';
@ -280,13 +283,20 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
} }
private refactorActionToCodeAction( private refactorActionToCodeAction(
action: Proto.RefactorActionInfo, action: RefactorActionInfo,
document: vscode.TextDocument, document: vscode.TextDocument,
info: Proto.ApplicableRefactorInfo, info: Proto.ApplicableRefactorInfo,
rangeOrSelection: vscode.Range | vscode.Selection, rangeOrSelection: vscode.Range | vscode.Selection,
allActions: readonly Proto.RefactorActionInfo[], allActions: readonly Proto.RefactorActionInfo[],
) { ) {
const codeAction = new vscode.CodeAction(action.description, TypeScriptRefactorProvider.getKind(action)); const codeAction = new vscode.CodeAction(action.description, TypeScriptRefactorProvider.getKind(action));
// https://github.com/microsoft/TypeScript/pull/37871
if (action.error) {
codeAction.disabled = { reason: action.error };
return codeAction;
}
codeAction.command = { codeAction.command = {
title: action.description, title: action.description,
command: ApplyRefactoringCommand.ID, command: ApplyRefactoringCommand.ID,