more cleanup

Author: pokey

packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/VscodeFancyRangeHighlighter.ts

@@ -6,11 +6,8 @@ import { VscodeFancyRangeHighlighterRenderer } from "./VscodeFancyRangeHighlight
 import { generateDecorationsForCharacterRange } from "./generateDecorationsForCharacterRange";
 import { generateDecorationsForLineRange } from "./generateDecorationsForLineRange";
 import { generateDifferentiatedRanges } from "./generateDifferentiatedRanges";
-import {
-  DecorationStyle,
-  DifferentiatedStyledRange,
-} from "./getDecorationRanges.types";
-import { groupDifferentiatedRanges } from "./groupDifferentiatedRanges";
+import { DifferentiatedStyledRange } from "./getDecorationRanges.types";
+import { groupDifferentiatedStyledRanges } from "./groupDifferentiatedStyledRanges";
 
 /**
  * Manages VSCode decoration types for a highlight or flash style.
@@ -23,9 +20,7 @@ export class VscodeFancyRangeHighlighter {
   }
 
   setRanges(editor: VscodeTextEditorImpl, ranges: GeneralizedRange[]) {
-    const decoratedRanges: Iterable<
-      DifferentiatedStyledRange<DecorationStyle>
-    > = flatmap(
+    const decoratedRanges: Iterable<DifferentiatedStyledRange> = flatmap(
       generateDifferentiatedRanges(ranges),
 
       function* ({ range, differentiationIndex }) {
@@ -46,23 +41,10 @@ export class VscodeFancyRangeHighlighter {
       },
     );
 
-    this.renderer.setRanges(
-      editor,
-      groupDifferentiatedRanges(decoratedRanges, getStyleKey),
-    );
+    this.renderer.setRanges(editor, groupDifferentiatedStyledRanges(decoratedRanges));
   }
 
   dispose() {
     this.renderer.dispose();
   }
 }
-
-function getStyleKey({
-  top,
-  right,
-  left,
-  bottom,
-  isWholeLine,
-}: DecorationStyle) {
-  return [top, right, left, bottom, isWholeLine ?? false];
-}

packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/VscodeFancyRangeHighlighterRenderer.ts

@@ -17,7 +17,7 @@ import {
 
 export class VscodeFancyRangeHighlighterRenderer {
   private decorationTypes: CompositeKeyDefaultMap<
-    DifferentiatedStyle<DecorationStyle>,
+    DifferentiatedStyle,
     TextEditorDecorationType
   >;
 
@@ -40,7 +40,7 @@ export class VscodeFancyRangeHighlighterRenderer {
 
   setRanges(
     editor: VscodeTextEditorImpl,
-    decoratedRanges: DifferentiatedStyledRangeList<DecorationStyle>[],
+    decoratedRanges: DifferentiatedStyledRangeList[],
   ) {
     const untouchedDecorationTypes = new Set(this.decorationTypes.values());
 
@@ -50,16 +50,18 @@ export class VscodeFancyRangeHighlighterRenderer {
         b.differentiatedStyles.differentiationIndex,
     );
 
-    decoratedRanges.forEach(({ differentiatedStyles: styleParameters, ranges }) => {
-      const decorationType = this.decorationTypes.get(styleParameters);
+    decoratedRanges.forEach(
+      ({ differentiatedStyles: styleParameters, ranges }) => {
+        const decorationType = this.decorationTypes.get(styleParameters);
 
-      editor.vscodeEditor.setDecorations(
-        decorationType,
-        ranges.map(toVscodeRange),
-      );
+        editor.vscodeEditor.setDecorations(
+          decorationType,
+          ranges.map(toVscodeRange),
+        );
 
-      untouchedDecorationTypes.delete(decorationType);
-    });
+        untouchedDecorationTypes.delete(decorationType);
+      },
+    );
 
     untouchedDecorationTypes.forEach((decorationType) => {
       editor.vscodeEditor.setDecorations(decorationType, []);

packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/generateDecorationsForCharacterRange.ts

@@ -1,12 +1,12 @@
 import { Range, TextEditor } from "@cursorless/common";
 import { range } from "lodash";
-import { BorderStyle, DecoratedRange } from "./getDecorationRanges.types";
+import { BorderStyle, StyledRange } from "./getDecorationRanges.types";
 import { handleMultipleLines } from "./handleMultipleLines";
 
 export function* generateDecorationsForCharacterRange(
   editor: TextEditor,
   characterRange: Range,
-): Iterable<DecoratedRange> {
+): Iterable<StyledRange> {
   if (characterRange.isSingleLine) {
     yield {
       range: characterRange,

packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/generateDecorationsForLineRange.ts

@@ -1,10 +1,10 @@
 import { Range } from "@cursorless/common";
-import { BorderStyle, DecoratedRange } from "./getDecorationRanges.types";
+import { BorderStyle, StyledRange } from "./getDecorationRanges.types";
 
 export function* generateDecorationsForLineRange(
   startLine: number,
   endLine: number,
-): Iterable<DecoratedRange> {
+): Iterable<StyledRange> {
   const lineCount = endLine - startLine + 1;
 
   if (lineCount === 1) {

packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/generateDifferentiatedRanges.ts

@@ -5,14 +5,14 @@ import {
 } from "@cursorless/common";
 
 import { max } from "lodash";
-import { DifferentiatedRange } from "./getDecorationRanges.types";
+import { DifferentiatedGeneralizedRange } from "./getDecorationRanges.types";
 
 export function* generateDifferentiatedRanges(
   ranges: GeneralizedRange[],
-): Iterable<DifferentiatedRange> {
+): Iterable<DifferentiatedGeneralizedRange> {
   ranges.sort(compareGeneralizedRangesByStart);
 
-  let currentRanges: DifferentiatedRange[] = [];
+  let currentRanges: DifferentiatedGeneralizedRange[] = [];
 
   for (const range of ranges) {
     currentRanges = [
@@ -25,7 +25,7 @@ export function* generateDifferentiatedRanges(
     const differentiatedRange = {
       range,
       differentiationIndex: getDifferentiationIndex(currentRanges, range),
-    } as DifferentiatedRange;
+    } as DifferentiatedGeneralizedRange;
 
     yield differentiatedRange;
 
@@ -34,7 +34,7 @@ export function* generateDifferentiatedRanges(
 }
 
 function getDifferentiationIndex(
-  currentRanges: DifferentiatedRange[],
+  currentRanges: DifferentiatedGeneralizedRange[],
   range: GeneralizedRange,
 ): number {
   const maxContainingDifferentiationIndex = max(

packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/getDecorationRanges.test.ts

@@ -1,6 +1,9 @@
 import assert = require("assert");
 import { getDecorationRanges } from "./getDecorationRanges";
-import { DecorationStyle, DifferentiatedStyle } from "./getDecorationRanges.types";
+import {
+  DecorationStyle,
+  DifferentiatedStyle,
+} from "./getDecorationRanges.types";
 import {
   Range,
   RangePlainObject,

packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/getDecorationRanges.types.ts

@@ -19,37 +19,37 @@ export interface DecorationStyle {
   isWholeLine?: boolean;
 }
 
-export interface StyledRange<T> {
-  style: T;
-  range: Range;
+export interface DifferentiatedStyle {
+  style: DecorationStyle;
+  differentiationIndex: number;
 }
 
-export type DecoratedRange = StyledRange<DecorationStyle>;
-
-export interface DifferentiatedStyle<T> {
-  style: T;
-  differentiationIndex: number;
+export interface StyledRange {
+  style: DecorationStyle;
+  range: Range;
 }
 
-export interface DifferentiatedStyledRange<T> {
-  differentiatedStyle: DifferentiatedStyle<T>;
+export interface DifferentiatedStyledRange {
+  differentiatedStyle: DifferentiatedStyle;
   range: Range;
 }
 
-export interface DifferentiatedStyledRangeList<T> {
-  differentiatedStyles: DifferentiatedStyle<T>;
+export interface DifferentiatedStyledRangeList {
+  differentiatedStyles: DifferentiatedStyle;
   ranges: Range[];
 }
 
-export interface DifferentiatedRange {
+export interface DifferentiatedGeneralizedRange {
   range: GeneralizedRange;
   differentiationIndex: number;
 }
 
-export interface DifferentiatedCharacterRange extends DifferentiatedRange {
+export interface DifferentiatedCharacterRange
+  extends DifferentiatedGeneralizedRange {
   range: CharacterRange;
 }
 
-export interface DifferentiatedLineRange extends DifferentiatedRange {
+export interface DifferentiatedLineRange
+  extends DifferentiatedGeneralizedRange {
   range: LineRange;
 }

packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/groupDifferentiatedRanges.ts renamed to packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/groupDifferentiatedStyledRanges.ts

@@ -5,19 +5,15 @@ import {
   DifferentiatedStyledRange,
 } from "./getDecorationRanges.types";
 
-export function groupDifferentiatedRanges<T>(
-  decoratedRanges: Iterable<DifferentiatedStyledRange<T>>,
-  getKeyList: (style: T) => unknown[],
-): DifferentiatedStyledRangeList<T>[] {
+export function groupDifferentiatedStyledRanges(
+  decoratedRanges: Iterable<DifferentiatedStyledRange>,
+): DifferentiatedStyledRangeList[] {
   const decorations: CompositeKeyDefaultMap<
-    DifferentiatedStyle<T>,
-    DifferentiatedStyledRangeList<T>
+    DifferentiatedStyle,
+    DifferentiatedStyledRangeList
   > = new CompositeKeyDefaultMap(
     (differentiatedStyles) => ({ differentiatedStyles, ranges: [] }),
-    ({ style, differentiationIndex }) => [
-      ...getKeyList(style),
-      differentiationIndex,
-    ],
+    getStyleKey,
   );
 
   for (const { range, differentiatedStyle } of decoratedRanges) {
@@ -26,3 +22,10 @@ export function groupDifferentiatedRanges<T>(
 
   return Array.from(decorations.values());
 }
+
+function getStyleKey({
+  style: { top, right, left, bottom, isWholeLine },
+  differentiationIndex,
+}: DifferentiatedStyle) {
+  return [top, right, left, bottom, isWholeLine ?? false, differentiationIndex];
+}

packages/cursorless-vscode/src/ide/vscode/VSCodeScopeVisualizer/VscodeFancyRangeHighlighter/handleMultipleLines.ts

@@ -2,13 +2,13 @@ import { Range } from "@cursorless/common";
 import {
   BorderStyle,
   DecorationStyle,
-  DecoratedRange,
+  StyledRange,
 } from "./getDecorationRanges.types";
 import { flatmap } from "itertools";
 
 export function* handleMultipleLines(
   lineRanges: Range[],
-): Iterable<DecoratedRange> {
+): Iterable<StyledRange> {
   yield* flatmap(generateLineGroupings(lineRanges), handleLine);
 }
 
@@ -71,7 +71,7 @@ function* handleLine({
   previousLine,
   currentLine,
   nextLine,
-}: LineGrouping): Iterable<DecoratedRange> {
+}: LineGrouping): Iterable<StyledRange> {
   const events: Event[] = [
     ...(previousLine == null
       ? []