Rename jumpToUsage => jumpToMethod throughout

This commit is contained in:
Robert
2023-10-10 10:14:27 +01:00
parent 153424ae5a
commit 47509a922a
6 changed files with 22 additions and 20 deletions

View File

@@ -323,7 +323,7 @@ export type PackagingCommands = {
export type ModelEditorCommands = { export type ModelEditorCommands = {
"codeQL.openModelEditor": () => Promise<void>; "codeQL.openModelEditor": () => Promise<void>;
"codeQL.openModelEditorFromModelingPanel": () => Promise<void>; "codeQL.openModelEditorFromModelingPanel": () => Promise<void>;
"codeQLModelEditor.jumpToUsageLocation": ( "codeQLModelEditor.jumpToMethod": (
methodSignature: string, methodSignature: string,
databaseItem: DatabaseItem, databaseItem: DatabaseItem,
) => Promise<void>; ) => Promise<void>;

View File

@@ -526,8 +526,8 @@ interface SwitchModeMessage {
mode: Mode; mode: Mode;
} }
interface JumpToUsageMessage { interface JumpToMethodMessage {
t: "jumpToUsage"; t: "jumpToMethod";
methodSignature: string; methodSignature: string;
} }
@@ -602,7 +602,7 @@ export type FromModelEditorMessage =
| RefreshMethods | RefreshMethods
| OpenDatabaseMessage | OpenDatabaseMessage
| OpenExtensionPackMessage | OpenExtensionPackMessage
| JumpToUsageMessage | JumpToMethodMessage
| SaveModeledMethods | SaveModeledMethods
| GenerateMethodMessage | GenerateMethodMessage
| GenerateMethodsFromLlmMessage | GenerateMethodsFromLlmMessage

View File

@@ -94,7 +94,7 @@ export class MethodsUsageDataProvider
collapsibleState: TreeItemCollapsibleState.None, collapsibleState: TreeItemCollapsibleState.None,
command: { command: {
title: "Show usage", title: "Show usage",
command: "codeQLModelEditor.jumpToUsageLocation", command: "codeQLModelEditor.jumpToMethod",
arguments: [method.signature, this.databaseItem], arguments: [method.signature, this.databaseItem],
}, },
}; };

View File

@@ -77,7 +77,7 @@ export class ModelEditorModule extends DisposableObject {
"codeQL.openModelEditor": this.openModelEditor.bind(this), "codeQL.openModelEditor": this.openModelEditor.bind(this),
"codeQL.openModelEditorFromModelingPanel": "codeQL.openModelEditorFromModelingPanel":
this.openModelEditor.bind(this), this.openModelEditor.bind(this),
"codeQLModelEditor.jumpToUsageLocation": async ( "codeQLModelEditor.jumpToMethod": async (
methodSignature: string, methodSignature: string,
databaseItem: DatabaseItem, databaseItem: DatabaseItem,
) => { ) => {

View File

@@ -197,9 +197,11 @@ export class ModelEditorView extends AbstractWebview<
); );
break; break;
case "jumpToUsage": case "jumpToMethod":
await this.handleJumpToUsage(msg.methodSignature); await this.handleJumpToMethod(msg.methodSignature);
void telemetryListener?.sendUIInteraction("model-editor-jump-to-usage"); void telemetryListener?.sendUIInteraction(
"model-editor-jump-to-method",
);
break; break;
case "saveModeledMethods": 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); this.modelingStore.setSelectedMethod(this.databaseItem, methodSignature);
} }

View File

@@ -95,8 +95,8 @@ const ModelableMethodRow = forwardRef<HTMLElement | undefined, MethodRowProps>(
onChange, onChange,
} = props; } = props;
const jumpToUsage = useCallback( const jumpToMethod = useCallback(
() => sendJumpToUsageMessage(method), () => sendJumpToMethodMessage(method),
[method], [method],
); );
@@ -113,11 +113,11 @@ const ModelableMethodRow = forwardRef<HTMLElement | undefined, MethodRowProps>(
<MethodClassifications method={method} /> <MethodClassifications method={method} />
<MethodName {...props.method} /> <MethodName {...props.method} />
{mode === Mode.Application && ( {mode === Mode.Application && (
<UsagesButton onClick={jumpToUsage}> <UsagesButton onClick={jumpToMethod}>
{method.usages.length} {method.usages.length}
</UsagesButton> </UsagesButton>
)} )}
<ViewLink onClick={jumpToUsage}>View</ViewLink> <ViewLink onClick={jumpToMethod}>View</ViewLink>
{props.modelingInProgress && <ProgressRing />} {props.modelingInProgress && <ProgressRing />}
</ApiOrMethodCell> </ApiOrMethodCell>
{props.modelingInProgress && ( {props.modelingInProgress && (
@@ -180,8 +180,8 @@ const UnmodelableMethodRow = forwardRef<
>((props, ref) => { >((props, ref) => {
const { method, mode, revealedMethodSignature } = props; const { method, mode, revealedMethodSignature } = props;
const jumpToUsage = useCallback( const jumpToMethod = useCallback(
() => sendJumpToUsageMessage(method), () => sendJumpToMethodMessage(method),
[method], [method],
); );
@@ -195,11 +195,11 @@ const UnmodelableMethodRow = forwardRef<
<ModelingStatusIndicator status="saved" /> <ModelingStatusIndicator status="saved" />
<MethodName {...props.method} /> <MethodName {...props.method} />
{mode === Mode.Application && ( {mode === Mode.Application && (
<UsagesButton onClick={jumpToUsage}> <UsagesButton onClick={jumpToMethod}>
{method.usages.length} {method.usages.length}
</UsagesButton> </UsagesButton>
)} )}
<ViewLink onClick={jumpToUsage}>View</ViewLink> <ViewLink onClick={jumpToMethod}>View</ViewLink>
<MethodClassifications method={method} /> <MethodClassifications method={method} />
</ApiOrMethodCell> </ApiOrMethodCell>
<VSCodeDataGridCell gridColumn="span 4"> <VSCodeDataGridCell gridColumn="span 4">
@@ -210,9 +210,9 @@ const UnmodelableMethodRow = forwardRef<
}); });
UnmodelableMethodRow.displayName = "UnmodelableMethodRow"; UnmodelableMethodRow.displayName = "UnmodelableMethodRow";
function sendJumpToUsageMessage(method: Method) { function sendJumpToMethodMessage(method: Method) {
vscode.postMessage({ vscode.postMessage({
t: "jumpToUsage", t: "jumpToMethod",
methodSignature: method.signature, methodSignature: method.signature,
}); });
} }