Skip to content

Properly compare positions for cache validation #2712

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

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Properly compare positions for cache validation #2712

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
17 changes: 12 additions & 5 deletions packages/cursorless-engine/src/languages/TreeSitterQuery/treeSitterQueryCache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import type { Position, TextDocument } from "@cursorless/common";
import type { QueryMatch } from "./QueryCapture";

export class Cache {
private documentUri: string = "";
private documentVersion: number = -1;
private documentUri: string = "";
private documentLanguageId: string = "";
private startPosition: Position | undefined;
private endPosition: Position | undefined;
Expand All @@ -24,11 +24,11 @@ export class Cache {
endPosition: Position | undefined,
) {
return (
this.documentUri === document.uri.toString() &&
this.documentVersion === document.version &&
this.documentUri === document.uri.toString() &&
this.documentLanguageId === document.languageId &&
this.startPosition === startPosition &&
this.endPosition === endPosition
positionsEqual(this.startPosition, startPosition) &&
positionsEqual(this.endPosition, endPosition)
);
}

Expand All @@ -38,8 +38,8 @@ export class Cache {
endPosition: Position | undefined,
matches: QueryMatch[],
) {
this.documentUri = document.uri.toString();
this.documentVersion = document.version;
this.documentUri = document.uri.toString();
this.documentLanguageId = document.languageId;
this.startPosition = startPosition;
this.endPosition = endPosition;
Expand All @@ -51,4 +51,11 @@ export class Cache {
}
}

function positionsEqual(a: Position | undefined, b: Position | undefined) {
if (a == null || b == null) {
return a === b;
}
return a.isEqual(b);
}

export const treeSitterQueryCache = new Cache();
Loading