From 47509a922acbe504b753cbc298915d2f4b0da0dc Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 10 Oct 2023 10:14:27 +0100 Subject: [PATCH] Rename jumpToUsage => jumpToMethod throughout --- extensions/ql-vscode/src/common/commands.ts | 2 +- .../ql-vscode/src/common/interface-types.ts | 6 +++--- .../methods-usage-data-provider.ts | 2 +- .../src/model-editor/model-editor-module.ts | 2 +- .../src/model-editor/model-editor-view.ts | 10 ++++++---- .../src/view/model-editor/MethodRow.tsx | 20 +++++++++---------- 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/extensions/ql-vscode/src/common/commands.ts b/extensions/ql-vscode/src/common/commands.ts index 391daab0c..917ae1aef 100644 --- a/extensions/ql-vscode/src/common/commands.ts +++ b/extensions/ql-vscode/src/common/commands.ts @@ -323,7 +323,7 @@ export type PackagingCommands = { export type ModelEditorCommands = { "codeQL.openModelEditor": () => Promise; "codeQL.openModelEditorFromModelingPanel": () => Promise; - "codeQLModelEditor.jumpToUsageLocation": ( + "codeQLModelEditor.jumpToMethod": ( methodSignature: string, databaseItem: DatabaseItem, ) => Promise; diff --git a/extensions/ql-vscode/src/common/interface-types.ts b/extensions/ql-vscode/src/common/interface-types.ts index cdef79c98..d8a19359c 100644 --- a/extensions/ql-vscode/src/common/interface-types.ts +++ b/extensions/ql-vscode/src/common/interface-types.ts @@ -526,8 +526,8 @@ interface SwitchModeMessage { mode: Mode; } -interface JumpToUsageMessage { - t: "jumpToUsage"; +interface JumpToMethodMessage { + t: "jumpToMethod"; methodSignature: string; } @@ -602,7 +602,7 @@ export type FromModelEditorMessage = | RefreshMethods | OpenDatabaseMessage | OpenExtensionPackMessage - | JumpToUsageMessage + | JumpToMethodMessage | SaveModeledMethods | GenerateMethodMessage | GenerateMethodsFromLlmMessage diff --git a/extensions/ql-vscode/src/model-editor/methods-usage/methods-usage-data-provider.ts b/extensions/ql-vscode/src/model-editor/methods-usage/methods-usage-data-provider.ts index 7d2a6cf09..6675c9c38 100644 --- a/extensions/ql-vscode/src/model-editor/methods-usage/methods-usage-data-provider.ts +++ b/extensions/ql-vscode/src/model-editor/methods-usage/methods-usage-data-provider.ts @@ -94,7 +94,7 @@ export class MethodsUsageDataProvider collapsibleState: TreeItemCollapsibleState.None, command: { title: "Show usage", - command: "codeQLModelEditor.jumpToUsageLocation", + command: "codeQLModelEditor.jumpToMethod", arguments: [method.signature, this.databaseItem], }, }; diff --git a/extensions/ql-vscode/src/model-editor/model-editor-module.ts b/extensions/ql-vscode/src/model-editor/model-editor-module.ts index 4ee35d031..41b153d92 100644 --- a/extensions/ql-vscode/src/model-editor/model-editor-module.ts +++ b/extensions/ql-vscode/src/model-editor/model-editor-module.ts @@ -77,7 +77,7 @@ export class ModelEditorModule extends DisposableObject { "codeQL.openModelEditor": this.openModelEditor.bind(this), "codeQL.openModelEditorFromModelingPanel": this.openModelEditor.bind(this), - "codeQLModelEditor.jumpToUsageLocation": async ( + "codeQLModelEditor.jumpToMethod": async ( methodSignature: string, databaseItem: DatabaseItem, ) => { diff --git a/extensions/ql-vscode/src/model-editor/model-editor-view.ts b/extensions/ql-vscode/src/model-editor/model-editor-view.ts index 04a1521c9..4b4b5dc32 100644 --- a/extensions/ql-vscode/src/model-editor/model-editor-view.ts +++ b/extensions/ql-vscode/src/model-editor/model-editor-view.ts @@ -197,9 +197,11 @@ export class ModelEditorView extends AbstractWebview< ); break; - case "jumpToUsage": - await this.handleJumpToUsage(msg.methodSignature); - void telemetryListener?.sendUIInteraction("model-editor-jump-to-usage"); + case "jumpToMethod": + await this.handleJumpToMethod(msg.methodSignature); + void telemetryListener?.sendUIInteraction( + "model-editor-jump-to-method", + ); break; case "saveModeledMethods": @@ -361,7 +363,7 @@ export class ModelEditorView extends AbstractWebview< }); } - protected async handleJumpToUsage(methodSignature: string) { + protected async handleJumpToMethod(methodSignature: string) { this.modelingStore.setSelectedMethod(this.databaseItem, methodSignature); } diff --git a/extensions/ql-vscode/src/view/model-editor/MethodRow.tsx b/extensions/ql-vscode/src/view/model-editor/MethodRow.tsx index 8007389b5..4ab1fb553 100644 --- a/extensions/ql-vscode/src/view/model-editor/MethodRow.tsx +++ b/extensions/ql-vscode/src/view/model-editor/MethodRow.tsx @@ -95,8 +95,8 @@ const ModelableMethodRow = forwardRef( onChange, } = props; - const jumpToUsage = useCallback( - () => sendJumpToUsageMessage(method), + const jumpToMethod = useCallback( + () => sendJumpToMethodMessage(method), [method], ); @@ -113,11 +113,11 @@ const ModelableMethodRow = forwardRef( {mode === Mode.Application && ( - + {method.usages.length} )} - View + View {props.modelingInProgress && } {props.modelingInProgress && ( @@ -180,8 +180,8 @@ const UnmodelableMethodRow = forwardRef< >((props, ref) => { const { method, mode, revealedMethodSignature } = props; - const jumpToUsage = useCallback( - () => sendJumpToUsageMessage(method), + const jumpToMethod = useCallback( + () => sendJumpToMethodMessage(method), [method], ); @@ -195,11 +195,11 @@ const UnmodelableMethodRow = forwardRef< {mode === Mode.Application && ( - + {method.usages.length} )} - View + View @@ -210,9 +210,9 @@ const UnmodelableMethodRow = forwardRef< }); UnmodelableMethodRow.displayName = "UnmodelableMethodRow"; -function sendJumpToUsageMessage(method: Method) { +function sendJumpToMethodMessage(method: Method) { vscode.postMessage({ - t: "jumpToUsage", + t: "jumpToMethod", methodSignature: method.signature, }); }