Rename TriggerReason -> TriggerKind

Fixes #64216

extensions/typescript-language-features/src/features/signatureHelp.ts

@@ -73,7 +73,7 @@ class TypeScriptSignatureHelpProvider implements vscode.SignatureHelpProvider {
 
 function toTsTriggerReason(context: vscode.SignatureHelpContext): Proto.SignatureHelpTriggerReason {
 	switch (context.triggerReason) {
-		case vscode.SignatureHelpTriggerReason.TriggerCharacter:
+		case vscode.SignatureHelpTriggerKind.TriggerCharacter:
 			if (context.triggerCharacter) {
 				if (context.isRetrigger) {
 					return { kind: 'retrigger', triggerCharacter: context.triggerCharacter as any };
@@ -84,10 +84,10 @@ function toTsTriggerReason(context: vscode.SignatureHelpContext): Proto.Signatur
 				return { kind: 'invoked' };
 			}
 
-		case vscode.SignatureHelpTriggerReason.ContentChange:
+		case vscode.SignatureHelpTriggerKind.ContentChange:
 			return context.isRetrigger ? { kind: 'retrigger' } : { kind: 'invoked' };
 
-		case vscode.SignatureHelpTriggerReason.Invoke:
+		case vscode.SignatureHelpTriggerKind.Invoke:
 		default:
 			return { kind: 'invoked' };
 	}

src/vs/editor/common/modes.ts

@@ -615,14 +615,14 @@ export interface SignatureHelp {
 	activeParameter: number;
 }
 
-export enum SignatureHelpTriggerReason {
+export enum SignatureHelpTriggerKind {
 	Invoke = 1,
 	TriggerCharacter = 2,
 	ContentChange = 3,
 }
 
 export interface SignatureHelpContext {
-	readonly triggerReason: SignatureHelpTriggerReason;
+	readonly triggerReason: SignatureHelpTriggerKind;
 	readonly triggerCharacter?: string;
 	readonly isRetrigger: boolean;
 }

src/vs/editor/common/standalone/standaloneEnums.ts

@@ -594,7 +594,7 @@ export enum CompletionTriggerKind {
 	TriggerForIncompleteCompletions = 2
 }
 
-export enum SignatureHelpTriggerReason {
+export enum SignatureHelpTriggerKind {
 	Invoke = 1,
 	TriggerCharacter = 2,
 	ContentChange = 3

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.SignatureHelpTriggerReason.Invoke
+				triggerReason: modes.SignatureHelpTriggerKind.Invoke
 			});
 		}
 	}

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.SignatureHelpTriggerReason;
+	readonly triggerReason: modes.SignatureHelpTriggerKind;
 	readonly triggerCharacter?: string;
 }
 
@@ -193,7 +193,7 @@ export class ParameterHintsModel extends Disposable {
 
 		if (this.triggerChars.has(triggerCharCode) || this.isTriggered && this.retriggerChars.has(triggerCharCode)) {
 			this.trigger({
-				triggerReason: modes.SignatureHelpTriggerReason.TriggerCharacter,
+				triggerReason: 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.SignatureHelpTriggerReason.ContentChange });
+			this.trigger({ triggerReason: modes.SignatureHelpTriggerKind.ContentChange });
 		}
 	}
 
 	private onModelContentChange(): void {
 		if (this.isTriggered) {
-			this.trigger({ triggerReason: modes.SignatureHelpTriggerReason.ContentChange });
+			this.trigger({ triggerReason: modes.SignatureHelpTriggerKind.ContentChange });
 		}
 	}
 

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.SignatureHelpTriggerReason.Invoke,
+		triggerReason: modes.SignatureHelpTriggerKind.Invoke,
 		isRetrigger: false
 	}, CancellationToken.None));

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<modes.SignatureHelp> {
-				assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.TriggerCharacter);
+				assert.strictEqual(context.triggerReason, 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<modes.SignatureHelp> {
 				++invokeCount;
 				if (invokeCount === 1) {
-					assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerReason, 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.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerReason, 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<modes.SignatureHelp> {
 				++invokeCount;
 				if (invokeCount === 1) {
-					assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerReason, 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.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerReason, 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<modes.SignatureHelp> {
 				++invokeCount;
 
-				assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.TriggerCharacter);
+				assert.strictEqual(context.triggerReason, 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<modes.SignatureHelp> {
 				++invokeCount;
 				if (invokeCount === 1) {
-					assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerReason, 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.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerReason, 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.SignatureHelpTriggerReason.Invoke }, 0);
+					hintsModel.trigger({ triggerReason: modes.SignatureHelpTriggerKind.Invoke }, 0);
 				}
 
 				return new Promise<modes.SignatureHelp>(resolve => {
@@ -240,7 +240,7 @@ suite('ParameterHintsModel', () => {
 
 		disposables.push(modes.SignatureHelpProviderRegistry.register(mockFileSelector, longRunningProvider));
 
-		hintsModel.trigger({ triggerReason: modes.SignatureHelpTriggerReason.Invoke }, 0);
+		hintsModel.trigger({ triggerReason: 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<modes.SignatureHelp> {
 				++invokeCount;
 				if (invokeCount === 1) {
-					assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerReason, 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.SignatureHelpTriggerReason.TriggerCharacter);
+					assert.strictEqual(context.triggerReason, modes.SignatureHelpTriggerKind.TriggerCharacter);
 					assert.ok(context.isRetrigger);
 					assert.strictEqual(context.triggerCharacter, retriggerChar);
 					done();

src/vs/editor/standalone/browser/standaloneLanguages.ts

@@ -539,7 +539,7 @@ export function createMonacoLanguagesAPI(): typeof monaco.languages {
 		SymbolKind: standaloneEnums.SymbolKind,
 		IndentAction: standaloneEnums.IndentAction,
 		CompletionTriggerKind: standaloneEnums.CompletionTriggerKind,
-		SignatureHelpTriggerReason: standaloneEnums.SignatureHelpTriggerReason,
+		SignatureHelpTriggerKind: standaloneEnums.SignatureHelpTriggerKind,
 
 		// classes
 		FoldingRangeKind: modes.FoldingRangeKind,

src/vs/monaco.d.ts

@@ -4927,14 +4927,14 @@ declare namespace monaco.languages {
 		activeParameter: number;
 	}
 
-	export enum SignatureHelpTriggerReason {
+	export enum SignatureHelpTriggerKind {
 		Invoke = 1,
 		TriggerCharacter = 2,
 		ContentChange = 3
 	}
 
 	export interface SignatureHelpContext {
-		readonly triggerReason: SignatureHelpTriggerReason;
+		readonly triggerReason: SignatureHelpTriggerKind;
 		readonly triggerCharacter?: string;
 		readonly isRetrigger: boolean;
 	}

src/vs/vscode.d.ts

@@ -3126,7 +3126,7 @@ declare module 'vscode' {
 	/**
 	 * How a [`SignatureHelpProvider`](#SignatureHelpProvider) was triggered
 	 */
-	export enum SignatureHelpTriggerReason {
+	export enum SignatureHelpTriggerKind {
 		/**
 		 * Signature help was invoked manually by the user or by a command.
 		 */
@@ -3151,7 +3151,7 @@ declare module 'vscode' {
 		/**
 		 * Action that caused signature help to be triggered.
 		 */
-		readonly triggerReason: SignatureHelpTriggerReason;
+		readonly triggerReason: SignatureHelpTriggerKind;
 
 		/**
 		 * Character that caused signature help to be triggered.

src/vs/workbench/api/node/extHost.api.impl.ts

@@ -786,7 +786,7 @@ export function createApiFactory(
 			Selection: extHostTypes.Selection,
 			ShellExecution: extHostTypes.ShellExecution,
 			ShellQuoting: extHostTypes.ShellQuoting,
-			SignatureHelpTriggerReason: extHostTypes.SignatureHelpTriggerReason,
+			SignatureHelpTriggerKind: extHostTypes.SignatureHelpTriggerKind,
 			SignatureHelp: extHostTypes.SignatureHelp,
 			SignatureInformation: extHostTypes.SignatureInformation,
 			SnippetString: extHostTypes.SnippetString,

src/vs/workbench/api/node/extHostTypes.ts

@@ -1118,7 +1118,7 @@ export class SignatureHelp {
 	}
 }
 
-export enum SignatureHelpTriggerReason {
+export enum SignatureHelpTriggerKind {
 	Invoke = 1,
 	TriggerCharacter = 2,
 	ContentChange = 3,

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.SignatureHelpTriggerReason.Invoke, isRetrigger: false }, CancellationToken.None).then(value => {
+			return provideSignatureHelp(model, new EditorPosition(1, 1), { triggerReason: 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.SignatureHelpTriggerReason.Invoke, isRetrigger: false }, CancellationToken.None).then(value => {
+			return provideSignatureHelp(model, new EditorPosition(1, 1), { triggerReason: modes.SignatureHelpTriggerKind.Invoke, isRetrigger: false }, CancellationToken.None).then(value => {
 				assert.equal(value, undefined);
 			});
 		});