Automatically expand removal for Tree sitter targets

Author: AndreasArvidsson

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

@@ -1,17 +1,19 @@
 import type { Range, SimpleScopeTypeType } from "@cursorless/common";
+import type { Target } from "../../typings/target.types";
 import type { CommonTargetParameters } from "./BaseTarget";
 import { BaseTarget } from "./BaseTarget";
 import { InteriorTarget } from "./InteriorTarget";
 import { PlainTarget } from "./PlainTarget";
-import type { Target } from "../../typings/target.types";
 import {
   createContinuousRange,
   createContinuousRangeFromRanges,
 } from "./util/createContinuousRange";
-import { getDelimitedSequenceRemovalRange } from "./util/insertionRemovalBehaviors/DelimitedSequenceInsertionRemovalBehavior";
+import {
+  getDelimitedSequenceRemovalRange,
+  getSmartRemovalTarget,
+} from "./util/insertionRemovalBehaviors/DelimitedSequenceInsertionRemovalBehavior";
 import {
   getTokenLeadingDelimiterTarget,
-  getTokenRemovalRange,
   getTokenTrailingDelimiterTarget,
 } from "./util/insertionRemovalBehaviors/TokenInsertionRemovalBehavior";
 
@@ -93,11 +95,23 @@ export class ScopeTypeTarget extends BaseTarget<ScopeTypeTargetParameters> {
   }
 
   getRemovalRange(): Range {
-    return this.removalRange_ != null
-      ? this.removalRange_
-      : this.hasDelimiterRange_
-        ? getDelimitedSequenceRemovalRange(this)
-        : getTokenRemovalRange(this);
+    if (this.removalRange_ != null) {
+      return this.removalRange_;
+    }
+    if (this.hasDelimiterRange_) {
+      return getDelimitedSequenceRemovalRange(this);
+    }
+    return getSmartRemovalTarget(this).getRemovalRange();
+  }
+
+  getRemovalHighlightRange(): Range {
+    if (this.removalRange_ != null) {
+      return this.removalRange_;
+    }
+    if (this.hasDelimiterRange_) {
+      return getDelimitedSequenceRemovalRange(this);
+    }
+    return getSmartRemovalTarget(this).getRemovalHighlightRange();
   }
 
   maybeCreateRichRangeTarget(

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

@@ -0,0 +1,72 @@
+import type { Range, TextDocument, TextEditor } from "@cursorless/common";
+import type { Target } from "../../../../typings/target.types";
+import { shrinkRangeToFitContent } from "../../../../util/selectionUtils";
+import { DocumentTarget } from "../../DocumentTarget";
+import { LineTarget } from "../../LineTarget";
+import { ParagraphTarget } from "../../ParagraphTarget";
+import { TokenTarget } from "../../TokenTarget";
+import { union } from "../../../../util/rangeUtils";
+
+export function getSmartRemovalTarget(target: Target): Target {
+  const { editor, isReversed } = target;
+  const { document } = editor;
+  const contentRange = union(target.contentRange, target.prefixRange);
+
+  if (!isLine(document, contentRange)) {
+    return new TokenTarget({
+      editor,
+      isReversed,
+      contentRange: contentRange,
+    });
+  }
+
+  if (isDocument(editor, contentRange)) {
+    return new DocumentTarget({
+      editor,
+      isReversed,
+      contentRange: document.range,
+    });
+  }
+
+  if (isParagraph(document, contentRange)) {
+    return new ParagraphTarget({
+      editor,
+      isReversed,
+      contentRange: contentRange,
+    });
+  }
+
+  return new LineTarget({
+    editor,
+    isReversed,
+    contentRange: contentRange,
+  });
+}
+
+function isLine(document: TextDocument, contentRange: Range): boolean {
+  const start = document.lineAt(contentRange.start).rangeTrimmed?.start;
+  const end = document.lineAt(contentRange.end).rangeTrimmed?.end;
+  return (
+    start != null &&
+    end != null &&
+    start.isEqual(contentRange.start) &&
+    end.isEqual(contentRange.end)
+  );
+}
+
+function isParagraph(document: TextDocument, contentRange: Range): boolean {
+  const { start, end } = contentRange;
+  return (
+    (start.line === 0 || document.lineAt(start.line - 1).isEmptyOrWhitespace) &&
+    (end.line === document.lineCount - 1 ||
+      document.lineAt(end.line + 1).isEmptyOrWhitespace)
+  );
+}
+
+function isDocument(editor: TextEditor, contentRange: Range): boolean {
+  const documentContentRange = shrinkRangeToFitContent(
+    editor,
+    editor.document.range,
+  );
+  return documentContentRange.isRangeEqual(contentRange);
+}