Update imports

Author: AndreasArvidsson

packages/common/src/scopeVisualizerUtil/generateDecorationsForCharacterRange/generateLineInfos.ts

@@ -1,4 +1,4 @@
-import type { Range } from "../../types/Range";
+import type { Range } from "../..";
 
 /**
  * Generates a line info for each line in the given range, which includes

packages/common/src/scopeVisualizerUtil/generateDecorationsForCharacterRange/handleMultipleLines.test.ts

@@ -1,6 +1,6 @@
 import assert from "assert";
 import { map } from "itertools";
-import { Range } from "../../types/Range";
+import { Range } from "../..";
 import { BorderStyle } from "../decorationStyle.types";
 import { handleMultipleLines } from "./handleMultipleLines";
 

packages/common/src/scopeVisualizerUtil/generateDecorationsForCharacterRange/handleMultipleLines.ts

@@ -1,5 +1,5 @@
 import { flatmap } from "itertools";
-import { Range } from "../../types/Range";
+import { Range } from "../..";
 import type { DecorationStyle, StyledRange } from "../decorationStyle.types";
 import { BorderStyle } from "../decorationStyle.types";
 import type { LineInfo } from "./generateLineInfos";

packages/cursorless-org-docs/src/docs/components/combineHighlightStyles.ts

@@ -8,33 +8,30 @@ import {
 import type { BorderRadius, Highlight, Style } from "./types";
 
 export function flattenHighlights(highlights: Highlight[]): Highlight[] {
-  const positions = getUniquePositions(highlights);
+  const positions = getPositions(highlights);
   const results: Highlight[] = [];
 
   for (let i = 0; i < positions.length - 1; i++) {
-    const subRange: Range = new Range(positions[i], positions[i + 1]);
+    const range = new Range(positions[i], positions[i + 1]);
 
     const matchingHighlights = highlights.filter(({ range }) =>
-      range.contains(subRange),
+      range.contains(range),
     );
 
-    // This sub range could be between two scopes.
+    // This sub could be between two scopes.
     if (matchingHighlights.length === 0) {
       continue;
     }
 
-    const style = combineHighlightStyles(subRange, matchingHighlights);
+    const style = combineHighlightStyles(range, matchingHighlights);
 
-    results.push({
-      range: subRange,
-      style,
-    });
+    results.push({ range, style });
   }
 
   return results;
 }
 
-function getUniquePositions(highlights: Highlight[]): Position[] {
+function getPositions(highlights: Highlight[]): Position[] {
   const result: Position[] = [];
   const emptyHighlights = highlights.filter((h) => h.range.isEmpty);
   const positions = highlights