Support text based an syntax tree item

cursorless-dev · Nov 9, 2024 · 88e708b · 88e708b
1 parent a672947
commit 88e708b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 29 deletions.
diff --git a/data/fixtures/recorded/languages/typescript/takeItem.yml b/data/fixtures/recorded/languages/typescript/takeItem.yml
@@ -23,5 +23,5 @@ finalState:
 
     const value = { a: 1, b: 2, c: 3 };
   selections:
-    - anchor: {line: 1, character: 0}
-      active: {line: 1, character: 35}
+    - anchor: {line: 1, character: 6}
+      active: {line: 1, character: 34}
diff --git a/data/fixtures/scopes/javascript.core/collectionItem.unenclosed.iteration.scope b/data/fixtures/scopes/javascript.core/collectionItem.unenclosed.iteration.scope
diff --git a/packages/common/src/scopeSupportFacets/javascript.ts b/packages/common/src/scopeSupportFacets/javascript.ts
@@ -114,7 +114,6 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = {
   "value.field": supported,
 
   "collectionItem.unenclosed": supported,
-  "collectionItem.unenclosed.iteration": supported,
 };
 
 export const javascriptJsxScopeSupport: LanguageScopeSupportFacetMap = {

diff --git a/packages/cursorless-engine/src/processTargets/modifiers/ContainingScopeStage.ts b/packages/cursorless-engine/src/processTargets/modifiers/ContainingScopeStage.ts
@@ -45,23 +45,39 @@ export class ContainingScopeStage implements ModifierStage {
         .run(target);
     }
 
-    const containingScope = getContainingScopeTarget(
+    const containingScopes = getContainingScopeTarget(
       target,
       scopeHandler,
       ancestorIndex,
     );
-
-    if (containingScope == null) {
-      if (scopeType.type === "collectionItem") {
-        // For `collectionItem`, fall back to generic implementation
-        return this.modifierStageFactory
+    if (scopeType.type === "collectionItem") {
+      // For `collectionItem`, combine with generic implementation
+      try {
+        const legacyScopes = this.modifierStageFactory
           .getLegacyScopeStage(this.modifier)
           .run(target);
+        if (containingScopes == null) {
+          return legacyScopes;
+        }
+        if (containingScopes.length === 1 && legacyScopes.length === 1) {
+          const containingRange = containingScopes[0].contentRange;
+          const legacyRange = legacyScopes[0].contentRange;
+          if (
+            containingRange.contains(legacyRange) &&
+            !containingRange.isRangeEqual(legacyRange)
+          ) {
+            return legacyScopes;
+          }
+        }
+      } catch (_ex) {
+        // Do nothing
       }
+    }
 
+    if (containingScopes == null) {
       throw new NoContainingScopeError(this.modifier.scopeType.type);
     }
 
-    return containingScope;
+    return containingScopes;
   }
 }
diff --git a/queries/javascript.core.scm b/queries/javascript.core.scm
@@ -285,15 +285,6 @@
   (#insertion-delimiter! @collectionItem ", ")
 )
 
-;;!! let foo, bar;
-;;!      ^^^^^^^^
-;;!  -------------
-(lexical_declaration
-  .
-  (_) @collectionItem.iteration.start.startOf
-  ";"? @collectionItem.iteration.end.startOf
-) @collectionItem.iteration.domain
-
 (expression_statement
   [
     ;; name: