Skip to content

Use iteration colors for scope visualizer in document page #3028

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
Jul 9, 2025
Merged

Use iteration colors for scope visualizer in document page #3028

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
6 changes: 5 additions & 1 deletion packages/cursorless-org-docs/src/docs/components/ScopeVisualizer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,11 @@ function renderFacet(
}}
languageId={languageId ?? fixture.languageId}
renderWhitespace={renderWhitespace}
decorations={generateDecorations(fixture, rangeType)}
decorations={generateDecorations(
fixture,
rangeType,
facet.info.isIteration ?? false,
)}
>
{fixture.code}
</Code>
Expand Down
19 changes: 13 additions & 6 deletions packages/cursorless-org-docs/src/docs/components/calculateHighlights.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ import type { Fixture, Highlight, RangeType, RangeTypeColors } from "./types";
export function generateDecorations(
fixture: Fixture,
rangeType: RangeType,
isIteration: boolean,
): DecorationItem[] {
const { domainRanges, targetRanges } = getRanges(fixture, rangeType);

const codeLineRanges = getCodeLineRanges(fixture.code);
const colors = getColors(rangeType);
const colors = getColors(rangeType, isIteration);

const domainDecorations = getDecorations(codeLineRanges, domainRanges);
const targetRangeDecorations = getDecorations(codeLineRanges, targetRanges);
Expand All @@ -37,13 +38,19 @@ export function generateDecorations(
return highlightsToDecorations(highlights);
}

function getColors(rangeType: RangeType) {
function getColors(rangeType: RangeType, isIteration: boolean) {
const target = (() => {
if (isIteration) {
return highlightColors.iteration;
}
if (rangeType === "content") {
return highlightColors.content;
}
return highlightColors.removal;
})();
return {
domain: highlightColors.domain,
target:
rangeType === "content"
? highlightColors.content
: highlightColors.removal,
target,
};
}

Expand Down
Loading