rename

Author: AndreasArvidsson

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

@@ -19,7 +19,7 @@ import type {
   ScopeIteratorRequirements,
 } from "./scopeHandler.types";
 import type { ScopeHandlerFactory } from "./ScopeHandlerFactory";
-import { isHintsEveryScope } from "./util/isHintsEveryScope";
+import { isEveryScope } from "./util/isHintsEveryScope";
 
 abstract class BoundedBaseScopeHandler extends BaseScopeHandler {
   protected readonly isHierarchical = true;
@@ -93,9 +93,7 @@ abstract class BoundedBaseScopeHandler extends BaseScopeHandler {
         {
           ...hints,
           // For every (skipAncestorScopes=true) we don't want to go outside of the surrounding pair
-          containment: isHintsEveryScope(hints)
-            ? "required"
-            : hints.containment,
+          containment: isEveryScope(hints) ? "required" : hints.containment,
         },
       ),
     );

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/CollectionItemTextualScopeHandler.ts

@@ -14,7 +14,7 @@ import type {
   ScopeIteratorRequirements,
 } from "../scopeHandler.types";
 import type { ScopeHandlerFactory } from "../ScopeHandlerFactory";
-import { isHintsEveryScope } from "../util/isHintsEveryScope";
+import { isEveryScope } from "../util/isHintsEveryScope";
 import { OneWayNestedRangeFinder } from "../util/OneWayNestedRangeFinder";
 import { OneWayRangeFinder } from "../util/OneWayRangeFinder";
 import { collectionItemTextualIterationScopeHandler } from "./collectionItemTextualIterationScopeHandler";
@@ -43,7 +43,7 @@ export class CollectionItemTextualScopeHandler extends BaseScopeHandler {
     direction: Direction,
     hints: ScopeIteratorRequirements,
   ): Iterable<TargetScope> {
-    const isEveryScope = isHintsEveryScope(hints);
+    const isEveryScope = isEveryScope(hints);
     const separatorRanges = getSeparatorOccurrences(editor.document);
     const interiorRanges = getInteriorRanges(
       this.scopeHandlerFactory,

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

@@ -8,7 +8,7 @@ import { BaseScopeHandler } from "../BaseScopeHandler";
 import { compareTargetScopes } from "../compareTargetScopes";
 import type { TargetScope } from "../scope.types";
 import type { ScopeIteratorRequirements } from "../scopeHandler.types";
-import { isHintsEveryScope } from "../util/isHintsEveryScope";
+import { isEveryScope } from "../util/isHintsEveryScope";
 import { getQuerySearchRange } from "./getQuerySearchRange";
 import { mergeAdjacentBy } from "./mergeAdjacentBy";
 
@@ -25,7 +25,7 @@ export abstract class BaseTreeSitterScopeHandler extends BaseScopeHandler {
     hints: ScopeIteratorRequirements,
   ): Iterable<TargetScope> {
     const { document } = editor;
-    const isEveryScope = isHintsEveryScope(hints);
+    const isEveryScope = isEveryScope(hints);
 
     /** Narrow the range within which tree-sitter searches, for performance */
     const { start, end } = getQuerySearchRange(

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

@@ -3,6 +3,6 @@ import type { ScopeIteratorRequirements } from "../scopeHandler.types";
 /**
  * Returns true if the hints belong to the every scope modifier.
  */
-export function isHintsEveryScope(hints: ScopeIteratorRequirements): boolean {
+export function isEveryScope(hints: ScopeIteratorRequirements): boolean {
   return hints.containment == null && hints.skipAncestorScopes;
 }