Skip to content

Add interior scope to visualize sidebar #3291

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 4 commits into from
Jul 7, 2026
Merged

Add interior scope to visualize sidebar #3291

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62f0916
Add interior scope to visualize sidebar
AndreasArvidsson Jul 7, 2026
258590f
Name fix
AndreasArvidsson Jul 7, 2026
041ce1d
Another name change
AndreasArvidsson Jul 7, 2026
b236ecc
name fix
AndreasArvidsson Jul 7, 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
5 changes: 2 additions & 3 deletions packages/lib-common/src/types/command/PartialTargetDescriptor.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,8 @@ const simpleScopeTypeTypesSet = new Set(simpleScopeTypeTypes);

export type SimpleScopeTypeType = (typeof simpleScopeTypeTypes)[number];

export const pseudoScopes = new Set<SimpleScopeTypeType>([
export const pseudoScopeTypes = new Set<SimpleScopeTypeType>([
"instance",
"interior",
"className",
"functionName",
]);
Comment thread
AndreasArvidsson marked this conversation as resolved.
Outdated
Expand All @@ -229,7 +228,7 @@ export function isSimpleScopeType(
}

export function isPseudoScope(scopeType: ScopeType): boolean {
return isSimpleScopeType(scopeType) && pseudoScopes.has(scopeType.type);
return isSimpleScopeType(scopeType) && pseudoScopeTypes.has(scopeType.type);
}

export interface SimpleScopeType {
Expand Down
10 changes: 4 additions & 6 deletions packages/lib-engine/src/languages/TreeSitterQuery/captureNames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { pseudoScopes, simpleScopeTypeTypes } from "@cursorless/lib-common";
import { pseudoScopeTypes, simpleScopeTypeTypes } from "@cursorless/lib-common";

const scopeCaptureNames = [
...simpleScopeTypeTypes.filter((s) => !pseudoScopes.has(s)),
// Interior is a pseudo scope, but it's implemented with an actual internal scope
"interior",
] as const;
const scopeCaptureNames = simpleScopeTypeTypes.filter(
(s) => !pseudoScopeTypes.has(s),
);

export type ScopeCaptureName = (typeof scopeCaptureNames)[number];

Expand Down
20 changes: 3 additions & 17 deletions ...rocessTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/InteriorScopeHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
import type {
Direction,
Position,
ScopeType,
TextEditor,
} from "@cursorless/lib-common";
import { NoContainingScopeError } from "@cursorless/lib-common";
import type { Direction, Position, TextEditor } from "@cursorless/lib-common";
import type { LanguageDefinitions } from "../../../../languages/LanguageDefinitions";
import type { Target } from "../../../../typings/target.types";
import { InteriorTarget } from "../../../targets";
import { BaseScopeHandler } from "../BaseScopeHandler";
import type { TargetScope } from "../scope.types";
import type {
ComplexScopeType,
ScopeIteratorRequirements,
} from "../scopeHandler.types";
import type { ScopeIteratorRequirements } from "../scopeHandler.types";
import type { TreeSitterScopeHandler } from "../TreeSitterScopeHandler";

export class InteriorScopeHandler extends BaseScopeHandler {
public readonly scopeType = { type: "interior" } as const;
public readonly iterationScopeType = { type: "document" } as const;
protected isHierarchical = true;

static maybeCreate(
Expand All @@ -39,12 +31,6 @@ export class InteriorScopeHandler extends BaseScopeHandler {
super();
}

get iterationScopeType(): ScopeType | ComplexScopeType {
throw new NoContainingScopeError(
"Iteration scope for InteriorScopeHandler",
);
}

*generateScopeCandidates(
editor: TextEditor,
position: Position,
Expand Down
Loading