Merge branch 'main' into snippetVariants

Author: phillco

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,8 +9,9 @@ Thanks for your change!
 
 * Remember to *test the cheatsheet manually* if you've added a new action,
   modifier, or scope -- or changed any Talon files.
--->
 
+Remove this comment.
+-->
 
 
 ## Release notes

.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 [email protected]
+
       - name: Enable Corepack
         run: corepack enable
 

.github/workflows/pr-description.yaml

@@ -0,0 +1,30 @@
+name: PR Description
+
+on:
+  pull_request:
+    types: [opened, edited, reopened, synchronize]
+  merge_group:
+    branches: [main]
+
+jobs:
+  validate-pr-description:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up workspace
+        uses: actions/checkout@v2
+
+      - name: Validate description
+        run: |
+          # Fetch PR description from env with jq
+          PR_DESCRIPTION=$(jq -r ".pull_request.body" "$GITHUB_EVENT_PATH")
+          KEYWORD="REQUIRED_KEYWORD"
+
+          # Ensure PR author removed the welcome comment
+          if [[ $PR_DESCRIPTION = *"<!--"* ]] || [[ $PR_DESCRIPTION = *"-->"* ]]; then
+            echo "FAILED: Please remove the welcome comment from your PR description."
+            exit 1
+          else
+            echo "OK: Welcome comment is removed your PR description."
+          fi
+
+          echo "PASS: All checks OK!"

.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 [email protected]
+
       - name: Enable Corepack
         run: corepack enable
 

.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 [email protected]
+
       - name: Enable Corepack
         run: corepack enable
 

.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 [email protected]
+
       - name: Enable Corepack
         run: corepack enable
 

.gitignore

@@ -45,6 +45,8 @@ next-env.d.ts
 
 # test subset config
 packages/test-harness/testSubsetGrep.properties
+packages/test-harness/failedTests.properties
+
 
 # cursorless-neovim
 cursorless.nvim/node/cursorless-neovim

.vscode/launch.json

@@ -31,6 +31,7 @@
       "request": "launch",
       "env": {
         "CURSORLESS_MODE": "test",
+        "CURSORLESS_LOG_FAILED": "true",
         "CURSORLESS_REPO_ROOT": "${workspaceFolder}"
       },
       "args": [
@@ -52,6 +53,7 @@
       "env": {
         "CURSORLESS_MODE": "test",
         "CURSORLESS_RUN_TEST_SUBSET": "true",
+        "CURSORLESS_LOG_FAILED": "true",
         "CURSORLESS_REPO_ROOT": "${workspaceFolder}"
       },
       "args": [
@@ -136,6 +138,7 @@
       "program": "${workspaceFolder}/packages/test-harness/dist/runTalonTests.cjs",
       "env": {
         "CURSORLESS_MODE": "test",
+        "CURSORLESS_LOG_FAILED": "true",
         "CURSORLESS_REPO_ROOT": "${workspaceFolder}"
       },
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
@@ -171,6 +174,7 @@
       "program": "${workspaceFolder}/packages/test-harness/dist/runTalonJsTests.cjs",
       "env": {
         "CURSORLESS_MODE": "test",
+        "CURSORLESS_LOG_FAILED": "true",
         "CURSORLESS_REPO_ROOT": "${workspaceFolder}"
       },
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],

data/fixtures/scopes/lua/interior.branch.scope renamed to data/fixtures/scopes/lua/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] = " "