Skip to content

Optimize performance in bounded scope handler #3187

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
AndreasArvidsson merged 2 commits into from
Feb 21, 2026
Merged

Optimize performance in bounded scope handler #3187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2ea2b3
optimize performance
AndreasArvidsson Feb 21, 2026
82dc7ba
Cleanup
AndreasArvidsson Feb 21, 2026
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
43 changes: 36 additions & 7 deletions packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/BoundedScopeHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,23 @@ abstract class BoundedBaseScopeHandler extends BaseScopeHandler {
),
);

if (interiorScopes.length === 0) {
yield* targetScopes;
return;
}

for (const targetScope of targetScopes) {
const allScopes: TargetScope[] = [];
let allScopes: TargetScope[] | undefined;

for (const interiorScope of interiorScopes) {
const domain = targetScope.domain.intersection(interiorScope.domain);
if (domain != null && !domain.isEmpty) {
allScopes.push({
(allScopes ??= []).push({
editor,
domain,
getTargets: (isReversed) => {
return [
this.getTargets(
this.createTarget(
ensureSingleTarget(targetScope, isReversed),
ensureSingleTarget(interiorScope, isReversed),
),
Expand All @@ -121,6 +126,30 @@ abstract class BoundedBaseScopeHandler extends BaseScopeHandler {
}
}

if (allScopes == null) {
yield targetScope;
continue;
}

if (allScopes.length === 1) {
const intersectionScope = allScopes[0];
if (
compareTargetScopes(
direction,
position,
intersectionScope,
targetScope,
) <= 0
) {
yield intersectionScope;
yield targetScope;
} else {
yield targetScope;
yield intersectionScope;
}
continue;
}

// NB: We add the target scope last so that if it is identical to
// one of our intersection scopes, we prefer that one so that rich ranges
// function properly
Expand All @@ -132,7 +161,7 @@ abstract class BoundedBaseScopeHandler extends BaseScopeHandler {
}
}

protected abstract getTargets(target: Target, interior: Target): Target;
protected abstract createTarget(target: Target, interior: Target): Target;
}

function ensureSingleTarget(scope: TargetScope, isReversed: boolean): Target {
Expand All @@ -156,13 +185,13 @@ export class BoundedNonWhitespaceSequenceScopeHandler extends BoundedBaseScopeHa
super(scopeHandlerFactory, languageId, { type: "nonWhitespaceSequence" });
}

protected getTargets(target: Target, interior: Target): Target {
protected createTarget(target: Target, interior: Target): Target {
const contentRange = target.contentRange.intersection(
interior.contentRange,
);

if (contentRange == null || contentRange.isEmpty) {
throw Error("Expected non empty intersection");
throw Error("Expected non-empty intersection");
}

return new TokenTarget({
Expand All @@ -184,7 +213,7 @@ export class BoundedParagraphScopeHandler extends BoundedBaseScopeHandler {
super(scopeHandlerFactory, languageId, { type: "paragraph" });
}

protected getTargets(target: Target, interior: InteriorTarget): Target {
protected createTarget(target: Target, interior: InteriorTarget): Target {
if (!(target instanceof ParagraphTarget)) {
throw Error("Expected ParagraphTarget");
}
Expand Down
Loading