Skip to content

Remove resolveCanonicalUsage method #2978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robertbrignull wants to merge 1 commit into from
Closed

Remove resolveCanonicalUsage method #2978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions extensions/ql-vscode/src/model-editor/methods-usage/methods-usage-data-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,17 +164,6 @@ export class MethodsUsageDataProvider
return this.methods.find((e) => e.usages.includes(item));
}
}

public resolveCanonicalUsage(usage: Usage): Usage | undefined {
for (const method of this.methods) {
for (const u of method.usages) {
if (usagesAreEqual(u, usage)) {
return u;
}
}
}
return undefined;
}
}

export type MethodsUsageTreeViewItem = Method | Usage;
Expand All @@ -183,18 +172,6 @@ function isExternalApiUsage(item: MethodsUsageTreeViewItem): item is Method {
return (item as any).usages !== undefined;
}

function usagesAreEqual(u1: Usage, u2: Usage): boolean {
return (
u1.label === u2.label &&
u1.classification === u2.classification &&
u1.url.uri === u2.url.uri &&
u1.url.startLine === u2.url.startLine &&
u1.url.startColumn === u2.url.startColumn &&
u1.url.endLine === u2.url.endLine &&
u1.url.endColumn === u2.url.endColumn
);
}

function sortMethodsInGroups(methods: readonly Method[], mode: Mode): Method[] {
const grouped = groupMethods(methods, mode);

Expand Down
5 changes: 1 addition & 4 deletions extensions/ql-vscode/src/model-editor/methods-usage/methods-usage-panel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,7 @@ export class MethodsUsagePanel extends DisposableObject {
}

public async revealItem(usage: Usage): Promise<void> {
const canonicalUsage = this.dataProvider.resolveCanonicalUsage(usage);
if (canonicalUsage !== undefined) {
await this.treeView.reveal(canonicalUsage);
}
await this.treeView.reveal(usage);
}

private registerToModelingStoreEvents(): void {
Expand Down