Merge branch 'main' into scopeTestFormat

AndreasArvidsson · web-flow · commit db4317c788d9 · 2025-02-04T19:38:04.000+01:00
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -20,6 +20,10 @@ jobs:
         with:
           fetch-depth: 0
 
+      # FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
+      - name: Upgrade Corepack
+        run: npm install --global corepack@0.31.0
+
       - name: Enable Corepack
         run: corepack enable
 
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -27,6 +27,10 @@ jobs:
         with:
           python-version: 3.x
 
+      # FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
+      - name: Upgrade Corepack
+        run: npm install --global corepack@0.31.0
+
       - name: Enable Corepack
         run: corepack enable
 
diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml
@@ -16,6 +16,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      # FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
+      - name: Upgrade Corepack
+        run: npm install --global corepack@0.31.0
+
       - name: Enable Corepack
         run: corepack enable
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,6 +37,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      # FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
+      - name: Upgrade Corepack
+        run: npm install --global --force corepack@0.31.0
+
       - name: Enable Corepack
         run: corepack enable
 
diff --git a/data/fixtures/scopes/lua/interior.if.scope b/data/fixtures/scopes/lua/interior.if.scope
diff --git a/data/fixtures/scopes/python/interior.if.scope b/data/fixtures/scopes/python/interior.if.scope
@@ -0,0 +1,48 @@
+if True:
+    a
+elif False:
+    b
+else:
+    c
+---
+
+[#1 Content] =
+[#1 Removal] = 1:4-1:5
+      >-<
+1|     a
+
+[#1 Domain] = 0:0-1:5
+  >--------
+0| if True:
+1|     a
+   -----<
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Removal] = 3:4-3:5
+      >-<
+3|     b
+
+[#2 Domain] = 2:0-3:5
+  >-----------
+2| elif False:
+3|     b
+   -----<
+
+[#2 Insertion delimiter] = " "
+
+
+[#3 Content] =
+[#3 Removal] = 5:4-5:5
+      >-<
+5|     c
+
+[#3 Domain] = 4:0-5:5
+  >-----
+4| else:
+5|     c
+   -----<
+
+[#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/interior.loop.scope b/data/fixtures/scopes/python/interior.loop.scope
@@ -0,0 +1,16 @@
+for v in values:
+    pass
+---
+
+[Content] =
+[Removal] = 1:4-1:8
+      >----<
+1|     pass
+
+[Domain] = 0:0-1:8
+  >----------------
+0| for v in values:
+1|     pass
+   --------<
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/interior.loop2.scope b/data/fixtures/scopes/python/interior.loop2.scope
@@ -0,0 +1,16 @@
+while True:
+    pass
+---
+
+[Content] =
+[Removal] = 1:4-1:8
+      >----<
+1|     pass
+
+[Domain] = 0:0-1:8
+  >-----------
+0| while True:
+1|     pass
+   --------<
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/interior.switchCase.scope b/data/fixtures/scopes/python/interior.switchCase.scope
@@ -0,0 +1,62 @@
+match value:
+    case 1:
+        a
+    case _:
+        b
+---
+
+[#1 Content] = 1:4-4:9
+      >-------
+1|     case 1:
+2|         a
+3|     case _:
+4|         b
+   ---------<
+
+[#1 Removal] = 0:12-4:9
+              >
+0| match value:
+1|     case 1:
+2|         a
+3|     case _:
+4|         b
+   ---------<
+
+[#1 Domain] = 0:0-4:9
+  >------------
+0| match value:
+1|     case 1:
+2|         a
+3|     case _:
+4|         b
+   ---------<
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Removal] = 2:8-2:9
+          >-<
+2|         a
+
+[#2 Domain] = 1:4-2:9
+      >-------
+1|     case 1:
+2|         a
+   ---------<
+
+[#2 Insertion delimiter] = " "
+
+
+[#3 Content] =
+[#3 Removal] = 4:8-4:9
+          >-<
+4|         b
+
+[#3 Domain] = 3:4-4:9
+      >-------
+3|     case _:
+4|         b
+   ---------<
+
+[#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/interior.ternary.scope b/data/fixtures/scopes/python/interior.ternary.scope
@@ -0,0 +1,34 @@
+1 if True else 0
+---
+
+[#1 Content] =
+[#1 Removal] =
+[#1 Domain] = 0:0-0:1
+  >-<
+0| 1 if True else 0
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Removal] = 0:5-0:9
+       >----<
+0| 1 if True else 0
+
+[#2 Domain] = 0:2-0:9
+    >-------<
+0| 1 if True else 0
+
+[#2 Insertion delimiter] = " "
+
+
+[#3 Content] =
+[#3 Removal] = 0:15-0:16
+                 >-<
+0| 1 if True else 0
+
+[#3 Domain] = 0:10-0:16
+            >------<
+0| 1 if True else 0
+
+[#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/interior.try.scope b/data/fixtures/scopes/python/interior.try.scope
@@ -0,0 +1,48 @@
+try:
+    a
+except:
+    b
+finally:
+    c
+---
+
+[#1 Content] =
+[#1 Removal] = 1:4-1:5
+      >-<
+1|     a
+
+[#1 Domain] = 0:0-1:5
+  >----
+0| try:
+1|     a
+   -----<
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Removal] = 3:4-3:5
+      >-<
+3|     b
+
+[#2 Domain] = 2:0-3:5
+  >-------
+2| except:
+3|     b
+   -----<
+
+[#2 Insertion delimiter] = " "
+
+
+[#3 Content] =
+[#3 Removal] = 5:4-5:5
+      >-<
+5|     c
+
+[#3 Domain] = 4:0-5:5
+  >--------
+4| finally:
+5|     c
+   -----<
+
+[#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/interior.try2.scope b/data/fixtures/scopes/python/interior.try2.scope
@@ -0,0 +1,32 @@
+try:
+    a
+except*:
+    b
+---
+
+[#1 Content] =
+[#1 Removal] = 1:4-1:5
+      >-<
+1|     a
+
+[#1 Domain] = 0:0-1:5
+  >----
+0| try:
+1|     a
+   -----<
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Removal] = 3:4-3:5
+      >-<
+3|     b
+
+[#2 Domain] = 2:0-3:5
+  >--------
+2| except*:
+3|     b
+   -----<
+
+[#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/python/interior.with.scope b/data/fixtures/scopes/python/interior.with.scope
@@ -0,0 +1,16 @@
+with file:
+    pass
+---
+
+[Content] =
+[Removal] = 1:4-1:8
+      >----<
+1|     pass
+
+[Domain] = 0:0-1:8
+  >----------
+0| with file:
+1|     pass
+   --------<
+
+[Insertion delimiter] = " "
diff --git a/packages/common/src/scopeSupportFacets/lua.ts b/packages/common/src/scopeSupportFacets/lua.ts
@@ -16,5 +16,5 @@ export const luaScopeSupport: LanguageScopeSupportFacetMap = {
   namedFunction: supported,
   disqualifyDelimiter: supported,
   "interior.function": supported,
-  "interior.branch": supported,
+  "interior.if": supported,
 };
diff --git a/packages/common/src/scopeSupportFacets/python.ts b/packages/common/src/scopeSupportFacets/python.ts
@@ -43,6 +43,12 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = {
   "interior.class": supported,
   "interior.function": supported,
   "interior.lambda": supported,
+  "interior.if": supported,
+  "interior.try": supported,
+  "interior.switchCase": supported,
+  "interior.ternary": supported,
+  "interior.loop": supported,
+  "interior.with": supported,
 
   element: notApplicable,
   tags: notApplicable,
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts
@@ -705,6 +705,18 @@ export const scopeSupportFacetInfos: Record<
     isIteration: true,
   },
 
+  "interior.element": {
+    description: "The interior/children of an XML element",
+    scopeType: { type: "interior" },
+  },
+  "interior.command": {
+    description: "The body of a Talon command",
+    scopeType: { type: "interior" },
+  },
+  "interior.cell": {
+    description: "The body of a code cell in markdown",
+    scopeType: { type: "interior" },
+  },
   "interior.class": {
     description: "The body of a class",
     scopeType: { type: "interior" },
@@ -717,20 +729,28 @@ export const scopeSupportFacetInfos: Record<
     description: "The body of a lambda/anonymous function",
     scopeType: { type: "interior" },
   },
-  "interior.branch": {
+  "interior.if": {
     description: "The body of an if/elif/else branch",
     scopeType: { type: "interior" },
   },
-  "interior.element": {
-    description: "The interior/children of an XML element",
+  "interior.try": {
+    description: "The body of an try/catch/finally branch",
     scopeType: { type: "interior" },
   },
-  "interior.command": {
-    description: "The body of a Talon command",
+  "interior.switchCase": {
+    description: "The body of an switch case branch",
     scopeType: { type: "interior" },
   },
-  "interior.cell": {
-    description: "The body of a code cell in markdown",
+  "interior.ternary": {
+    description: "The body of an ternary condition/branch",
+    scopeType: { type: "interior" },
+  },
+  "interior.loop": {
+    description: "The body of an for/while loop",
+    scopeType: { type: "interior" },
+  },
+  "interior.with": {
+    description: "The body of an with/use/using statement",
     scopeType: { type: "interior" },
   },
 
diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts
diff --git a/queries/python.scm b/queries/python.scm
