Merge branch 'main' into dependabot/npm_and_yarn/packages/cheatsheet-local/webpack-5.94.0

Author: AndreasArvidsson

.github/actions/test-neovim-lua/action.yml

@@ -3,9 +3,9 @@ description: "Set up Neovim Lua environment and run Busted tests"
 runs:
   using: "composite"
   steps:
-    - uses: leafo/gh-actions-lua@v9
+    - uses: leafo/gh-actions-lua@v10
       with:
-        luaVersion: "luajit-2.1.0-beta3"
+        luaVersion: "luajit-openresty"
     - uses: leafo/gh-actions-luarocks@v4
     - shell: bash
       run: |

cursorless-talon/src/spoken_scope_forms.py

@@ -12,9 +12,9 @@ def init_scope_spoken_forms(graphemes_talon_list: dict[str, str]):
 def create_flattened_talon_list(ctx: Context, graphemes_talon_list: dict[str, str]):
     lists_to_merge = {
         "cursorless_scope_type": "simple",
-        "cursorless_surrounding_pair_scope_type": "surroundingPair",
         "cursorless_selectable_only_paired_delimiter": "surroundingPair",
         "cursorless_wrapper_selectable_paired_delimiter": "surroundingPair",
+        "cursorless_surrounding_pair_scope_type": "surroundingPair",
     }
     # If the user have no custom regex scope type, then that list is missing from the context
     if "user.cursorless_custom_regex_scope_type" in ctx.lists.keys():  # noqa: SIM118

data/fixtures/recorded/headTail/changeTail3.yml

@@ -0,0 +1,28 @@
+languageId: python
+command:
+  version: 7
+  spokenForm: change tail
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - {type: extendThroughEndOf}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    """foo
+    bar
+    """
+  selections:
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}
+  marks: {}
+finalState:
+  documentContents: |-
+    """
+    bar
+    """
+  selections:
+    - anchor: {line: 0, character: 3}
+      active: {line: 0, character: 3}

data/fixtures/recorded/surroundingPair/changeString.yml

@@ -0,0 +1,23 @@
+languageId: typescript
+command:
+  version: 7
+  spokenForm: change string
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: surroundingPair, delimiter: string}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "`hello`"
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/common/src/types/command/PartialTargetDescriptor.types.ts

@@ -251,6 +251,8 @@ export interface SurroundingPairScopeType {
 export interface SurroundingPairInteriorScopeType {
   type: "surroundingPairInterior";
   delimiter: SurroundingPairName;
+  // If true don't yield multiline pairs
+  requireSingleLine?: boolean;
 }
 
 export interface OneOfScopeType {

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

@@ -27,6 +27,7 @@ export class HeadTailStage implements ModifierStage {
             {
               type: "surroundingPairInterior",
               delimiter: "any",
+              requireSingleLine: true,
             },
           ],
         },

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

@@ -5,7 +5,6 @@ import type { TargetScope } from "../scope.types";
 import type { ScopeIteratorRequirements } from "../scopeHandler.types";
 import { type ScopeHandler } from "../scopeHandler.types";
 import type { ScopeHandlerFactory } from "../ScopeHandlerFactory";
-import { map } from "itertools";
 
 export class SurroundingPairInteriorScopeHandler extends BaseScopeHandler {
   protected isHierarchical = true;
@@ -32,28 +31,33 @@ export class SurroundingPairInteriorScopeHandler extends BaseScopeHandler {
     return this.surroundingPairScopeHandler.iterationScopeType;
   }
 
-  generateScopeCandidates(
+  *generateScopeCandidates(
     editor: TextEditor,
     position: Position,
     direction: Direction,
     hints: ScopeIteratorRequirements,
   ): Iterable<TargetScope> {
-    return map(
-      this.surroundingPairScopeHandler.generateScopes(
-        editor,
-        position,
-        direction,
-        hints,
-      ),
-      (scope) => ({
+    const scopes = this.surroundingPairScopeHandler.generateScopes(
+      editor,
+      position,
+      direction,
+      hints,
+    );
+
+    for (const scope of scopes) {
+      if (this.scopeType.requireSingleLine && !scope.domain.isSingleLine) {
+        continue;
+      }
+
+      yield {
         editor,
         domain: scope.domain,
         getTargets(isReversed) {
           return scope
             .getTargets(isReversed)
             .flatMap((target) => target.getInterior()!);
         },
-      }),
-    );
+      };
+    }
   }
 }