diff --git a/extensions/typescript-language-features/src/features/signatureHelp.ts b/extensions/typescript-language-features/src/features/signatureHelp.ts index 40b8f0c4f18..f41faf83908 100644 --- a/extensions/typescript-language-features/src/features/signatureHelp.ts +++ b/extensions/typescript-language-features/src/features/signatureHelp.ts @@ -22,7 +22,7 @@ class TypeScriptSignatureHelpProvider implements vscode.SignatureHelpProvider { document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken, - context?: vscode.SignatureHelpContext, + context: vscode.SignatureHelpContext, ): Promise { const filepath = this.client.toPath(document.uri); if (!filepath) { @@ -31,7 +31,7 @@ class TypeScriptSignatureHelpProvider implements vscode.SignatureHelpProvider { const args: Proto.SignatureHelpRequestArgs = { ...typeConverters.Position.toFileLocationRequestArgs(filepath, position), - triggerReason: toTsTriggerReason(context!) + triggerReason: toTsTriggerReason(context) }; const response = await this.client.interuptGetErr(() => this.client.execute('signatureHelp', args, token)); if (response.type !== 'response' || !response.body) { @@ -72,7 +72,7 @@ class TypeScriptSignatureHelpProvider implements vscode.SignatureHelpProvider { } function toTsTriggerReason(context: vscode.SignatureHelpContext): Proto.SignatureHelpTriggerReason { - switch (context.triggerReason) { + switch (context.triggerKind) { case vscode.SignatureHelpTriggerKind.TriggerCharacter: if (context.triggerCharacter) { if (context.isRetrigger) { diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 4c4799b7a70..3f601407837 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -622,7 +622,7 @@ export enum SignatureHelpTriggerKind { } export interface SignatureHelpContext { - readonly triggerReason: SignatureHelpTriggerKind; + readonly triggerKind: SignatureHelpTriggerKind; readonly triggerCharacter?: string; readonly isRetrigger: boolean; } diff --git a/src/vs/editor/contrib/parameterHints/parameterHints.ts b/src/vs/editor/contrib/parameterHints/parameterHints.ts index 523e938f441..c9104b79c65 100644 --- a/src/vs/editor/contrib/parameterHints/parameterHints.ts +++ b/src/vs/editor/contrib/parameterHints/parameterHints.ts @@ -78,7 +78,7 @@ export class TriggerParameterHintsAction extends EditorAction { let controller = ParameterHintsController.get(editor); if (controller) { controller.trigger({ - triggerReason: modes.SignatureHelpTriggerKind.Invoke + triggerKind: modes.SignatureHelpTriggerKind.Invoke }); } } diff --git a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts index bfc123fd48f..9ff9e8d11dd 100644 --- a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts +++ b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts @@ -29,7 +29,7 @@ import { MarkdownRenderer } from 'vs/editor/contrib/markdown/markdownRenderer'; const $ = dom.$; export interface TriggerContext { - readonly triggerReason: modes.SignatureHelpTriggerKind; + readonly triggerKind: modes.SignatureHelpTriggerKind; readonly triggerCharacter?: string; } @@ -107,7 +107,7 @@ export class ParameterHintsModel extends Disposable { this.throttledDelayer.trigger( () => this.doTrigger({ - triggerReason: context.triggerReason, + triggerKind: context.triggerKind, triggerCharacter: context.triggerCharacter, isRetrigger: this.isTriggered, }), delay).then(undefined, onUnexpectedError); @@ -193,7 +193,7 @@ export class ParameterHintsModel extends Disposable { if (this.triggerChars.has(triggerCharCode) || this.isTriggered && this.retriggerChars.has(triggerCharCode)) { this.trigger({ - triggerReason: modes.SignatureHelpTriggerKind.TriggerCharacter, + triggerKind: modes.SignatureHelpTriggerKind.TriggerCharacter, triggerCharacter: text.charAt(lastCharIndex), }); } @@ -203,13 +203,13 @@ export class ParameterHintsModel extends Disposable { if (e.source === 'mouse') { this.cancel(); } else if (this.isTriggered) { - this.trigger({ triggerReason: modes.SignatureHelpTriggerKind.ContentChange }); + this.trigger({ triggerKind: modes.SignatureHelpTriggerKind.ContentChange }); } } private onModelContentChange(): void { if (this.isTriggered) { - this.trigger({ triggerReason: modes.SignatureHelpTriggerKind.ContentChange }); + this.trigger({ triggerKind: modes.SignatureHelpTriggerKind.ContentChange }); } } diff --git a/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts b/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts index 3bb2a1d3155..37ad043a05f 100644 --- a/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts +++ b/src/vs/editor/contrib/parameterHints/provideSignatureHelp.ts @@ -28,6 +28,6 @@ export function provideSignatureHelp(model: ITextModel, position: Position, cont registerDefaultLanguageCommand('_executeSignatureHelpProvider', (model, position) => provideSignatureHelp(model, position, { - triggerReason: modes.SignatureHelpTriggerKind.Invoke, + triggerKind: modes.SignatureHelpTriggerKind.Invoke, isRetrigger: false }, CancellationToken.None)); diff --git a/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts b/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts index 5f76e32ea24..e7b40108bf4 100644 --- a/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts +++ b/src/vs/editor/contrib/parameterHints/test/parameterHintsModel.test.ts @@ -63,7 +63,7 @@ suite('ParameterHintsModel', () => { signatureHelpRetriggerCharacters = []; provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable { - assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerKind.TriggerCharacter); + assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter); assert.strictEqual(context.triggerCharacter, triggerChar); done(); return undefined; @@ -87,13 +87,13 @@ suite('ParameterHintsModel', () => { provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable { ++invokeCount; if (invokeCount === 1) { - assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerKind.TriggerCharacter); + assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter); assert.strictEqual(context.triggerCharacter, triggerChar); // Retrigger editor.trigger('keyboard', Handler.Type, { text: triggerChar }); } else { assert.strictEqual(invokeCount, 2); - assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerKind.TriggerCharacter); + assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter); assert.ok(context.isRetrigger); assert.strictEqual(context.triggerCharacter, triggerChar); done(); @@ -120,7 +120,7 @@ suite('ParameterHintsModel', () => { provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable { ++invokeCount; if (invokeCount === 1) { - assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerKind.TriggerCharacter); + assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter); assert.strictEqual(context.triggerCharacter, triggerChar); // Cancel and retrigger @@ -128,7 +128,7 @@ suite('ParameterHintsModel', () => { editor.trigger('keyboard', Handler.Type, { text: triggerChar }); } else { assert.strictEqual(invokeCount, 2); - assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerKind.TriggerCharacter); + assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter); assert.strictEqual(context.triggerCharacter, triggerChar); done(); } @@ -151,7 +151,7 @@ suite('ParameterHintsModel', () => { provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable { ++invokeCount; - assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerKind.TriggerCharacter); + assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter); assert.strictEqual(context.isRetrigger, false); assert.strictEqual(context.triggerCharacter, 'c'); @@ -182,13 +182,13 @@ suite('ParameterHintsModel', () => { provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable { ++invokeCount; if (invokeCount === 1) { - assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerKind.TriggerCharacter); + assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter); assert.strictEqual(context.triggerCharacter, 'a'); // retrigger after delay for widget to show up setTimeout(() => editor.trigger('keyboard', Handler.Type, { text: 'b' }), 50); } else if (invokeCount === 2) { - assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerKind.TriggerCharacter); + assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter); assert.ok(context.isRetrigger); assert.strictEqual(context.triggerCharacter, 'b'); done(); @@ -220,7 +220,7 @@ suite('ParameterHintsModel', () => { // retrigger on first request if (count === 0) { - hintsModel.trigger({ triggerReason: modes.SignatureHelpTriggerKind.Invoke }, 0); + hintsModel.trigger({ triggerKind: modes.SignatureHelpTriggerKind.Invoke }, 0); } return new Promise(resolve => { @@ -240,7 +240,7 @@ suite('ParameterHintsModel', () => { disposables.push(modes.SignatureHelpProviderRegistry.register(mockFileSelector, longRunningProvider)); - hintsModel.trigger({ triggerReason: modes.SignatureHelpTriggerKind.Invoke }, 0); + hintsModel.trigger({ triggerKind: modes.SignatureHelpTriggerKind.Invoke }, 0); assert.strictEqual(-1, didRequestCancellationOf); return new Promise((resolve, reject) => @@ -270,13 +270,13 @@ suite('ParameterHintsModel', () => { provideSignatureHelp(_model: ITextModel, _position: Position, _token: CancellationToken, context: modes.SignatureHelpContext): modes.SignatureHelp | Thenable { ++invokeCount; if (invokeCount === 1) { - assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerKind.TriggerCharacter); + assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter); assert.strictEqual(context.triggerCharacter, triggerChar); // retrigger after delay for widget to show up setTimeout(() => editor.trigger('keyboard', Handler.Type, { text: retriggerChar }), 50); } else if (invokeCount === 2) { - assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerKind.TriggerCharacter); + assert.strictEqual(context.triggerKind, modes.SignatureHelpTriggerKind.TriggerCharacter); assert.ok(context.isRetrigger); assert.strictEqual(context.triggerCharacter, retriggerChar); done(); diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 9d4d2731df2..dcab6165c0a 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -4934,7 +4934,7 @@ declare namespace monaco.languages { } export interface SignatureHelpContext { - readonly triggerReason: SignatureHelpTriggerKind; + readonly triggerKind: SignatureHelpTriggerKind; readonly triggerCharacter?: string; readonly isRetrigger: boolean; } diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 9b8b9646e90..c313c838c75 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -3151,7 +3151,7 @@ declare module 'vscode' { /** * Action that caused signature help to be triggered. */ - readonly triggerReason: SignatureHelpTriggerKind; + readonly triggerKind: SignatureHelpTriggerKind; /** * Character that caused signature help to be triggered. diff --git a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts index d470a9f158f..c58f98ce627 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts @@ -887,7 +887,7 @@ suite('ExtHostLanguageFeatures', function () { return rpcProtocol.sync().then(() => { - return provideSignatureHelp(model, new EditorPosition(1, 1), { triggerReason: modes.SignatureHelpTriggerKind.Invoke, isRetrigger: false }, CancellationToken.None).then(value => { + return provideSignatureHelp(model, new EditorPosition(1, 1), { triggerKind: modes.SignatureHelpTriggerKind.Invoke, isRetrigger: false }, CancellationToken.None).then(value => { assert.ok(value); }); }); @@ -902,7 +902,7 @@ suite('ExtHostLanguageFeatures', function () { return rpcProtocol.sync().then(() => { - return provideSignatureHelp(model, new EditorPosition(1, 1), { triggerReason: modes.SignatureHelpTriggerKind.Invoke, isRetrigger: false }, CancellationToken.None).then(value => { + return provideSignatureHelp(model, new EditorPosition(1, 1), { triggerKind: modes.SignatureHelpTriggerKind.Invoke, isRetrigger: false }, CancellationToken.None).then(value => { assert.equal(value, undefined); }); });