Clean up

Author: AndreasArvidsson

cursorless-everywhere-talon/cursorless_everywhere_talon.py

@@ -6,7 +6,7 @@
 from .cursorless_everywhere_types import (
     EditorEdit,
     EditorState,
-    FlashDescriptorOffsets,
+    RangeOffsets,
     SelectionOffsets,
 )
 
@@ -63,7 +63,7 @@ def cursorless_everywhere_edit_text(
         """Edit focused element text"""
 
     def cursorless_everywhere_flash_ranges(
-        ranges: list[FlashDescriptorOffsets],  # pyright: ignore [reportGeneralTypeIssues]
+        ranges: list[RangeOffsets],  # pyright: ignore [reportGeneralTypeIssues]
     ):
         """Flash ranges in focused element"""
         actions.skip()

cursorless-everywhere-talon/cursorless_everywhere_talon_browser.py

@@ -3,7 +3,7 @@
 from .cursorless_everywhere_types import (
     EditorEdit,
     EditorState,
-    FlashDescriptorOffsets,
+    RangeOffsets,
     SelectionOffsets,
 )
 
@@ -63,18 +63,11 @@ def cursorless_everywhere_edit_text(
             actions.next(edit)
 
     def cursorless_everywhere_flash_ranges(
-        ranges: list[FlashDescriptorOffsets],  # pyright: ignore [reportGeneralTypeIssues]
+        ranges: list[RangeOffsets],  # pyright: ignore [reportGeneralTypeIssues]
     ):
         updated = [
-            js_object_to_python_dict(d, ["style", "range"])
-            for d in js_array_to_python_list(ranges)
-        ]
-        updated = [
-            {
-                "style": d["style"],
-                "range": js_object_to_python_dict(d["range"], ["type", "start", "end"]),
-            }
-            for d in updated
+            js_object_to_python_dict(r, ["start", "end"])
+            for r in js_array_to_python_list(ranges)
         ]
         command = {
             "id": "flashRanges",

cursorless-everywhere-talon/cursorless_everywhere_types.py

@@ -1,31 +1,16 @@
-from typing import Literal, TypedDict
+from typing import TypedDict
 
 
 class SelectionOffsets(TypedDict):
     anchor: int
     active: int
 
 
-class CharacterRangeOffsets(TypedDict):
-    type: Literal["character"]
+class RangeOffsets(TypedDict):
     start: int
     end: int
 
 
-class LineRange(TypedDict):
-    type: Literal["line"]
-    start: int
-    end: int
-
-
-GeneralizedRangeOffsets = CharacterRangeOffsets | LineRange
-
-
-class FlashDescriptorOffsets(TypedDict):
-    style: str
-    range: GeneralizedRangeOffsets
-
-
 class EditorState(TypedDict):
     text: str
     selections: list[SelectionOffsets]

packages/cursorless-everywhere-talon-core/src/ide/flashRanges.ts

@@ -1,22 +1,18 @@
 import type { FlashDescriptor } from "@cursorless/common";
 import type { Talon } from "../types/talon.types";
-import type { FlashDescriptorOffsets } from "../types/types";
-import { toGeneralizedRangeOffsets } from "./toGeneralizedRangeOffsets";
+import type { RangeOffsets } from "../types/types";
+import { toCharacterRangeOffsets } from "./toCharacterRangeOffsets";
 
 export function flashRanges(
   talon: Talon,
   flashDescriptors: FlashDescriptor[],
 ): Promise<void> {
-  const offsetDescriptors = flashDescriptors.map(
-    (descriptor): FlashDescriptorOffsets => {
-      return {
-        style: descriptor.style,
-        range: toGeneralizedRangeOffsets(descriptor.editor, descriptor.range),
-      };
-    },
+  const ranges = flashDescriptors.map(
+    (descriptor): RangeOffsets =>
+      toCharacterRangeOffsets(descriptor.editor, descriptor.range),
   );
 
-  talon.actions.user.cursorless_everywhere_flash_ranges(offsetDescriptors);
+  talon.actions.user.cursorless_everywhere_flash_ranges(ranges);
 
   return Promise.resolve();
 }

packages/cursorless-everywhere-talon-core/src/ide/toCharacterRangeOffsets.ts

@@ -0,0 +1,20 @@
+import type { GeneralizedRange, TextEditor } from "@cursorless/common";
+import type { RangeOffsets } from "../types/types";
+
+export function toCharacterRangeOffsets(
+  editor: TextEditor,
+  range: GeneralizedRange,
+): RangeOffsets {
+  if (range.type === "line") {
+    const startLine = editor.document.lineAt(range.start).range;
+    const endLine = editor.document.lineAt(range.end).range;
+    return {
+      start: editor.document.offsetAt(startLine.start),
+      end: editor.document.offsetAt(endLine.end),
+    };
+  }
+  return {
+    start: editor.document.offsetAt(range.start),
+    end: editor.document.offsetAt(range.end),
+  };
+}

packages/cursorless-everywhere-talon-core/src/ide/toGeneralizedRangeOffsets.ts

@@ -1,7 +1,7 @@
 import type {
+  RangeOffsets,
   EditorEdit,
   EditorState,
-  FlashDescriptorOffsets,
   SelectionOffsets,
 } from "./types";
 
@@ -22,9 +22,7 @@ export interface TalonActions {
     cursorless_everywhere_get_editor_state(): EditorState;
     cursorless_everywhere_set_selections(selections: SelectionOffsets[]): void;
     cursorless_everywhere_edit_text(edit: EditorEdit): void;
-    cursorless_everywhere_flash_ranges(
-      flashDescriptors: FlashDescriptorOffsets[],
-    ): void;
+    cursorless_everywhere_flash_ranges(ranges: RangeOffsets[]): void;
   };
 }
 

packages/cursorless-everywhere-talon-core/src/types/talon.types.ts

@@ -1,9 +1,7 @@
 import type {
   Command,
   CommandResponse,
-  FlashStyle,
   IDE,
-  LineRange,
   NormalizedIDE,
   TestHelpers,
 } from "@cursorless/common";
@@ -16,19 +14,11 @@ export interface SelectionOffsets {
   active: number;
 }
 
-export interface CharacterRangeOffsets {
-  type: "character";
+export interface RangeOffsets {
   start: number;
   end: number;
 }
 
-export type GeneralizedRangeOffsets = CharacterRangeOffsets | LineRange;
-
-export interface FlashDescriptorOffsets {
-  style: FlashStyle;
-  range: GeneralizedRangeOffsets;
-}
-
 export interface EditorState {
   text: string;
   languageId?: string;

packages/cursorless-everywhere-talon-core/src/types/types.ts

@@ -1,7 +1,7 @@
 import type {
+  RangeOffsets,
   EditorEdit,
   EditorState,
-  FlashDescriptorOffsets,
   SelectionOffsets,
   Talon,
   TalonActions,
@@ -54,9 +54,7 @@ const actions: TalonActions = {
       }
       _finalEditorState.text = edit.text;
     },
-    cursorless_everywhere_flash_ranges(
-      _flashDescriptors: FlashDescriptorOffsets[],
-    ): void {
+    cursorless_everywhere_flash_ranges(_ranges: RangeOffsets[]): void {
       // Do nothing
     },
   },