Move range utils to common

Author: AndreasArvidsson

packages/common/src/index.ts

@@ -110,6 +110,7 @@ export * from "./util/Notifier";
 export * from "./util/object";
 export * from "./util/omitByDeep";
 export * from "./util/prettifyLanguageName";
+export * from "./util/rangeUtils";
 export * from "./util/regex";
 export * from "./util/selectionsEqual";
 export * from "./util/serializedMarksToTokenHats";

packages/cursorless-engine/src/util/rangeUtils.ts renamed to packages/common/src/util/rangeUtils.ts

@@ -1,6 +1,5 @@
 import type { Direction, Position } from "@cursorless/common";
-import { Range } from "@cursorless/common";
-import { strictlyContains } from "../../../util/rangeUtils";
+import { Range, strictlyContains } from "@cursorless/common";
 import { compareTargetScopes } from "./compareTargetScopes";
 import type { TargetScope } from "./scope.types";
 import type { ScopeIteratorRequirements } from "./scopeHandler.types";

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/shouldYieldScope.ts

@@ -1,6 +1,5 @@
 import type { Range, TextEditor } from "@cursorless/common";
-
-import { getRangeLength } from "../../../../util/rangeUtils";
+import { getRangeLength } from "@cursorless/common";
 
 /**
  * Picks which of the leading and trailing delimiter ranges to use for removal when both are present.

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/util/getCollectionItemRemovalRange.ts

@@ -1,7 +1,6 @@
-import { toLineRange, type Range } from "@cursorless/common";
+import { expandToFullLine, toLineRange, type Range } from "@cursorless/common";
 import type { InteriorTarget, ParagraphTarget } from ".";
 import type { TextualType } from "../../typings/target.types";
-import { expandToFullLine } from "../../util/rangeUtils";
 import type { MinimumTargetParameters } from "./BaseTarget";
 import { BaseTarget } from "./BaseTarget";
 import { LineTarget } from "./LineTarget";

packages/cursorless-engine/src/processTargets/targets/BoundedParagraphTarget.ts

@@ -1,12 +1,11 @@
 import type { InsertionMode, Selection, TextEditor } from "@cursorless/common";
-import { Range } from "@cursorless/common";
+import { Range, union } from "@cursorless/common";
 import type { EditWithRangeUpdater } from "../../typings/Types";
 import type {
   Destination,
   EditNewActionType,
   Target,
 } from "../../typings/target.types";
-import { union } from "../../util/rangeUtils";
 
 export class DestinationImpl implements Destination {
   public readonly contentRange: Range;

packages/cursorless-engine/src/processTargets/targets/DestinationImpl.ts

@@ -1,7 +1,11 @@
 import type { TextEditor } from "@cursorless/common";
-import { Position, Range, toLineRange } from "@cursorless/common";
+import {
+  expandToFullLine,
+  Position,
+  Range,
+  toLineRange,
+} from "@cursorless/common";
 import type { TextualType } from "../../typings/target.types";
-import { expandToFullLine } from "../../util/rangeUtils";
 import { tryConstructTarget } from "../../util/tryConstructTarget";
 import type { CommonTargetParameters } from "./BaseTarget";
 import { BaseTarget } from "./BaseTarget";

packages/cursorless-engine/src/processTargets/targets/LineTarget.ts

@@ -4,9 +4,13 @@ import type {
   TextEditor,
   TextLine,
 } from "@cursorless/common";
-import { Position, Range, toLineRange } from "@cursorless/common";
+import {
+  expandToFullLine,
+  Position,
+  Range,
+  toLineRange,
+} from "@cursorless/common";
 import type { TextualType } from "../../typings/target.types";
-import { expandToFullLine } from "../../util/rangeUtils";
 import type { CommonTargetParameters } from "./BaseTarget";
 import { BaseTarget } from "./BaseTarget";
 import { constructLineTarget, LineTarget } from "./LineTarget";

packages/cursorless-engine/src/processTargets/targets/ParagraphTarget.ts

@@ -1,6 +1,6 @@
 import type { Range } from "@cursorless/common";
+import { union } from "@cursorless/common";
 import type { Target } from "../../../../typings/target.types";
-import { union } from "../../../../util/rangeUtils";
 
 /**
  * Constructs a removal range for the given target that includes either the

packages/cursorless-engine/src/processTargets/targets/util/insertionRemovalBehaviors/DelimitedSequenceInsertionRemovalBehavior.ts

@@ -1,7 +1,6 @@
 import type { TextEditor } from "@cursorless/common";
-import { Range } from "@cursorless/common";
+import { expandToFullLine, Range, union } from "@cursorless/common";
 import type { Target } from "../../../../typings/target.types";
-import { expandToFullLine, union } from "../../../../util/rangeUtils";
 import { PlainTarget } from "../../PlainTarget";
 
 const leadingDelimiters = ['"', "'", "(", "[", "{", "<"];