Fix circular dependences

Author: AndreasArvidsson

oxlint.config.mts

@@ -184,7 +184,6 @@ export default defineConfig({
         extensions: [".tsx"],
       },
     ],
-    "import/no-cycle": "off",
     eqeqeq: [
       "warn",
       "always",

packages/lib-common/src/ide/inMemoryTextEditor/InMemoryTextEditor.ts

@@ -1,19 +1,20 @@
 import { URI } from "vscode-uri";
+import type { Edit } from "../../types/Edit";
+import type { GeneralizedRange } from "../../types/GeneralizedRange";
+import type { Range } from "../../types/Range";
+import type { RevealLineAt } from "../../types/RevealLineAt";
+import { Selection } from "../../types/Selection";
+import type { SelectionOffsets } from "../../types/Selection";
+import type { TextDocument } from "../../types/TextDocument";
 import type {
-  Edit,
   EditableTextEditor,
-  EmittableIDE,
-  GeneralizedRange,
   OpenLinkOptions,
-  Range,
-  RevealLineAt,
-  SelectionOffsets,
   SetSelectionsOpts,
-  TextDocument,
   TextEditor,
-  TextEditorOptions,
-} from "@cursorless/lib-common";
-import { Selection, selectionsEqual } from "@cursorless/lib-common";
+} from "../../types/TextEditor";
+import type { TextEditorOptions } from "../../types/TextEditorOptions";
+import { selectionsEqual } from "../../util/selectionsEqual";
+import type { EmittableIDE } from "../types/ide.types";
 import { InMemoryTextDocument } from "./InMemoryTextDocument";
 
 interface Params {

packages/lib-common/src/ide/types/RawTreeSitterQueryProvider.ts

@@ -1,4 +1,4 @@
-import type { Disposable } from "@cursorless/lib-common";
+import type { Disposable } from "./ide.types";
 
 /**
  * Provides raw tree-sitter queries. These are usually read from `.scm` files

packages/lib-common/src/types/Position.ts

@@ -1,5 +1,4 @@
 import { stringToInteger } from "../util/stringUtils";
-import { Range } from "./Range";
 import type { TextDocument } from "./TextDocument";
 
 export class Position {
@@ -158,14 +157,6 @@ export class Position {
     );
   }
 
-  /**
-   * Create a new empty range from this position.
-   * @returns A {@link Range}
-   */
-  public toEmptyRange(): Range {
-    return new Range(this, this);
-  }
-
   /**
    * Return a concise string representation of the position. 0-based.
    * @returns concise representation

packages/lib-common/src/types/Range.ts

@@ -26,10 +26,20 @@ export class Range {
         `Invalid concise range format: "${concise}". Expected "start-end" format.`,
       );
     }
-    const [start, end] = parts.map((s) => Position.fromConcise(s));
+    const start = Position.fromConcise(parts[0]);
+    const end = Position.fromConcise(parts[1]);
     return new Range(start, end);
   }
 
+  /**
+   * Create a new empty range from a position.
+   * @param position A position.
+   * @returns A {@link Range}
+   */
+  static fromPosition(position: Position): Range {
+    return new Range(position, position);
+  }
+
   /**
    * Create a new range from two positions.
    * The earlier of `p1` and `p2` will be used as the start position.

packages/lib-common/src/types/SpokenFormType.ts

@@ -1,9 +1,9 @@
+import type { ActionType } from "./command/ActionDescriptor";
 import type {
-  ActionType,
   ModifierType,
   SimpleScopeTypeType,
   SurroundingPairName,
-} from "@cursorless/lib-common";
+} from "./command/PartialTargetDescriptor.types";
 
 /**
  * This interface is the source of truth for the types used in our spoken form

packages/lib-common/src/types/TalonSpokenForms.ts

@@ -1,4 +1,4 @@
-import type { Notifier } from "@cursorless/lib-common";
+import type { Notifier } from "../util/Notifier";
 import type { SpokenFormMapKeyTypes, SpokenFormType } from "./SpokenFormType";
 
 /**

packages/lib-common/src/types/TreeSitter.ts

@@ -1,5 +1,5 @@
 import type { Query, Tree } from "web-tree-sitter";
-import type { TextDocument } from "@cursorless/lib-common";
+import type { TextDocument } from "./TextDocument";
 
 export interface TreeSitter {
   /**

packages/lib-engine/src/actions/BreakLine.ts

@@ -65,7 +65,7 @@ function getEdits(editor: TextEditor, contentRanges: Range[]): Edit[] {
             new Position(line.lineNumber, characterTrailingWhitespace),
             position,
           )
-        : position.toEmptyRange();
+        : Range.fromPosition(position);
 
     edits.push({
       range: replacementRange,

packages/lib-engine/src/actions/IndentLine.ts

@@ -96,7 +96,7 @@ function getIndentEdits(editor: TextEditor, targets: Target[]) {
   return lineNumbers.map((lineNumber) => {
     const line = document.lineAt(lineNumber);
     return {
-      range: line.range.start.toEmptyRange(),
+      range: Range.fromPosition(line.range.start),
       text: indent,
     };
   });