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

Add experimental trigger reason to ts server protocol

Browse source 
For https://github.com/microsoft/TypeScript/issues/35096
This commit is contained in:
Matt Bierner 2020-04-14 13:55:08 -07:00
parent 941f7a4d0b
commit b6c2ea092d
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,10 +19,24 @@ import FormattingOptionsManager from './fileConfigurationManager';
const localize = nls.loadMessageBundle();
interface RefactorActionInfo extends Proto.RefactorActionInfo {
error?: string
namespace Experimental {
export interface RefactorActionInfo extends Proto.RefactorActionInfo {
readonly error?: string
}
export type RefactorTriggerReason = RefactorInvokedReason;
export interface RefactorInvokedReason {
readonly kind: 'invoked';
}
export interface GetApplicableRefactorsRequestArgs extends Proto.FileRangeRequestArgs {
readonly triggerReason?: RefactorTriggerReason;
}
}
class ApplyRefactoringCommand implements Command {
public static readonly ID = '_typescript.applyRefactoring';
public readonly id = ApplyRefactoringCommand.ID;
@ -244,7 +258,10 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
}
this.formattingOptionsManager.ensureConfigurationForDocument(document, token);
const args: Proto.GetApplicableRefactorsRequestArgs = typeConverters.Range.toFileRangeRequestArgs(file, rangeOrSelection);
const args: Experimental.GetApplicableRefactorsRequestArgs = {
...typeConverters.Range.toFileRangeRequestArgs(file, rangeOrSelection),
triggerReason: this.toTsTriggerReason(context),
};
return this.client.execute('getApplicableRefactors', args, token);
});
if (response?.type !== 'response' || !response.body) {
@ -258,6 +275,13 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
return this.appendInvalidActions(actions);
}
private toTsTriggerReason(context: vscode.CodeActionContext): Experimental.RefactorInvokedReason | undefined {
if (!context.only) {
return;
}
return { kind: 'invoked' };
}
private convertApplicableRefactors(
body: Proto.ApplicableRefactorInfo[],
document: vscode.TextDocument,
@ -283,7 +307,7 @@ class TypeScriptRefactorProvider implements vscode.CodeActionProvider {
}
private refactorActionToCodeAction(
action: RefactorActionInfo,
action: Experimental.RefactorActionInfo,
document: vscode.TextDocument,
info: Proto.ApplicableRefactorInfo,
rangeOrSelection: vscode.Range | vscode.Selection,