Cleanup

Author: AndreasArvidsson

packages/cursorless-engine/src/languages/TreeSitterQuery/TreeSitterQuery.ts

@@ -110,7 +110,7 @@ export class TreeSitterQuery {
     match: treeSitter.QueryMatch,
   ): MutableQueryMatch {
     return {
-      patternIdx: match.pattern,
+      patternIdx: match.patternIndex,
       captures: match.captures.map(({ name, node }) => ({
         name,
         node,

packages/cursorless-engine/src/processTargets/modifiers/EveryScopeStage.ts

@@ -111,8 +111,6 @@ export class EveryScopeStage implements ModifierStage {
     const iterationScopeTarget = getContainingScopeTarget(
       target,
       iterationScopeHandler,
-      0, // ancestorIndex
-      true, // skipEmptyScopes
     );
 
     if (iterationScopeTarget == null) {

packages/cursorless-engine/src/processTargets/modifiers/getContainingScopeTarget.ts

@@ -17,7 +17,6 @@ export function getContainingScopeTarget(
   target: Target,
   scopeHandler: ScopeHandler,
   ancestorIndex: number = 0,
-  skipEmptyScopes?: boolean,
 ): Target[] | undefined {
   const {
     isReversed,
@@ -27,13 +26,7 @@ export function getContainingScopeTarget(
 
   if (end.isEqual(start)) {
     // Input target is empty; return the preferred scope touching target
-    let scope = getPreferredScopeTouchingPosition(
-      scopeHandler,
-      editor,
-      start,
-      undefined,
-      skipEmptyScopes,
-    );
+    let scope = getPreferredScopeTouchingPosition(scopeHandler, editor, start);
 
     if (scope == null) {
       return undefined;

packages/cursorless-engine/src/processTargets/modifiers/getPreferredScopeTouchingPosition.ts

@@ -29,7 +29,6 @@ export function getPreferredScopeTouchingPosition(
   editor: TextEditor,
   position: Position,
   forceDirection?: Direction,
-  skipEmptyScopes?: boolean,
 ): TargetScope | undefined {
   /**
    * We're looking for the minimal scopes that contain position.  We'll get:
@@ -44,7 +43,6 @@ export function getPreferredScopeTouchingPosition(
       containment: "required",
       allowAdjacentScopes: true,
       skipAncestorScopes: true,
-      skipEmptyScopes: skipEmptyScopes ?? false,
     }),
   );
 

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

@@ -19,7 +19,6 @@ const DEFAULT_REQUIREMENTS: Omit<ScopeIteratorRequirements, "distalPosition"> =
     allowAdjacentScopes: false,
     skipAncestorScopes: false,
     includeDescendantScopes: false,
-    skipEmptyScopes: false,
   };
 
 /**

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

@@ -4,21 +4,28 @@ import type {
   SurroundingPairScopeType,
   TextEditor,
 } from "@cursorless/common";
-import { showError, type ScopeType } from "@cursorless/common";
+import { showError } from "@cursorless/common";
 import type { LanguageDefinitions } from "../../../../languages/LanguageDefinitions";
 import { ide } from "../../../../singletons/ide.singleton";
 import { BaseScopeHandler } from "../BaseScopeHandler";
 import { compareTargetScopes } from "../compareTargetScopes";
 import type { TargetScope } from "../scope.types";
-import type { ScopeIteratorRequirements } from "../scopeHandler.types";
+import type {
+  ConditionalScopeType,
+  ScopeIteratorRequirements,
+} from "../scopeHandler.types";
 import { createTargetScope } from "./createTargetScope";
 import { getDelimiterOccurrences } from "./getDelimiterOccurrences";
 import { getIndividualDelimiters } from "./getIndividualDelimiters";
 import { getSurroundingPairOccurrences } from "./getSurroundingPairOccurrences";
 import type { SurroundingPairOccurrence } from "./types";
 
 export class SurroundingPairScopeHandler extends BaseScopeHandler {
-  public readonly iterationScopeType: ScopeType = { type: "line" };
+  public readonly iterationScopeType: ConditionalScopeType = {
+    type: "conditional",
+    scopeType: { type: "line" },
+    predicate: (scope) => !scope.domain.isEmpty,
+  };
   protected isHierarchical = true;
 
   constructor(

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/TreeSitterScopeHandler/TreeSitterIterationScopeHandler.ts

@@ -47,6 +47,10 @@ export class TreeSitterIterationScopeHandler extends BaseTreeSitterScopeHandler
 
     const { range: contentRange, allowMultiple } = capture;
 
+    if (contentRange.isEmpty) {
+      return undefined;
+    }
+
     const domain =
       getRelatedRange(match, scopeTypeType, "iteration.domain", false) ??
       contentRange;

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/scopeHandler.types.ts

@@ -178,16 +178,6 @@ export interface ScopeIteratorRequirements {
    */
   skipAncestorScopes: boolean;
 
-  /**
-   * Indicates whether the ScopeHandler should skip yielding a scope if it's
-   * range is empty.
-   * - `true` means that empty scopes will not be yielded.
-   * - `false` means that empty scopes will be yielded
-   *
-   * @default false
-   */
-  skipEmptyScopes: boolean;
-
   /**
    * Indicates whether the ScopeHandler should yield a scope if it is a
    * descendant of any scope that has been previously yielded.

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

@@ -57,7 +57,6 @@ function checkRequirements(
     distalPosition,
     allowAdjacentScopes,
     skipAncestorScopes,
-    skipEmptyScopes,
   } = requirements;
   const { domain } = scope;
 
@@ -88,13 +87,6 @@ function checkRequirements(
     return false;
   }
 
-  if (
-    skipEmptyScopes &&
-    !scope.getTargets(false).some((t) => !t.contentRange.isEmpty)
-  ) {
-    return false;
-  }
-
   return partiallyContains(
     new Range(position, distalPosition),
     domain,

packages/cursorless-engine/src/scopeProviders/getIterationScopeRanges.ts

@@ -41,7 +41,6 @@ export function getIterationScopeRanges(
       {
         includeDescendantScopes: true,
         distalPosition: iterationRange.end,
-        skipEmptyScopes: true,
       },
     ),
     (scope) => {