Revert "merge upstream"

This reverts commit 5443020.

Author: fidgetingbits

.editorconfig

@@ -28,7 +28,7 @@ trim_trailing_whitespace = false
 [Makefile]
 indent_style = tab
 
-[**/{vendor,generated}/**]
+[**/vendor/**]
 charset = unset
 end_of_line = unset
 indent_size = unset

.eslintrc.json

@@ -11,13 +11,7 @@
     "ecmaVersion": 6,
     "sourceType": "module"
   },
-  "plugins": [
-    "@typescript-eslint",
-    "unused-imports",
-    "import",
-    "unicorn",
-    "mocha"
-  ],
+  "plugins": ["@typescript-eslint", "unused-imports", "import"],
   "rules": {
     "import/no-relative-packages": "error",
     "@typescript-eslint/consistent-type-assertions": [
@@ -58,10 +52,7 @@
       "MemberExpression[object.property.name='constructor'][property.name='name']"
     ],
     "no-throw-literal": "warn",
-    "semi": "off",
-    "unicorn/prefer-module": "error",
-    "mocha/no-skipped-tests": "error",
-    "mocha/no-exclusive-tests": "error"
+    "semi": "off"
   },
   "overrides": [
     {
@@ -86,10 +77,5 @@
       }
     }
   },
-  "ignorePatterns": [
-    "**/vendor/**/*.ts",
-    "**/vendor/**/*.js",
-    "**/out/**",
-    "**/generated/**"
-  ]
+  "ignorePatterns": ["**/vendor/**/*.ts", "**/vendor/**/*.js", "**/out/**"]
 }

.github/CODEOWNERS

@@ -1,4 +1 @@
-*       @pokey @AndreasArvidsson
-
-*keyboard* @pokey @josharian
-*Keyboard* @pokey @josharian
+*       @pokey

.github/workflows/deploy.yaml

@@ -20,7 +20,7 @@ jobs:
       - uses: pnpm/action-setup@v2
       - uses: actions/setup-node@v3
         with:
-          node-version-file: package.json
+          node-version: 16
           cache: pnpm
       - run: pnpm --color install
       - run: pnpm --color compile

.github/workflows/pre-commit.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: pnpm/action-setup@v2
       - uses: actions/setup-node@v3
         with:
-          node-version-file: package.json
+          node-version: 16
           cache: pnpm
       - run: pnpm --color install
       - uses: pre-commit/[email protected]

.github/workflows/test-docs.yml

@@ -16,6 +16,6 @@ jobs:
       - uses: pnpm/action-setup@v2
       - uses: actions/setup-node@v3
         with:
-          node-version-file: package.json
+          node-version: 16
           cache: pnpm
       - run: bash -x scripts/build-and-assemble-website.sh

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
       - uses: pnpm/action-setup@v2
       - uses: actions/setup-node@v3
         with:
-          node-version-file: package.json
+          node-version: 16
           cache: pnpm
       - run: mkdir -p "${{ env.VSCODE_CRASH_DIR }}" "${{ env.VSCODE_LOGS_DIR }}"
         shell: bash
@@ -72,5 +72,3 @@ jobs:
           name: dumps
           path: ${{ env.VSCODE_CRASH_DIR }}
         if: failure()
-      - name: Forbid TODOs
-        run: ./scripts/forbid-todo.sh

.pre-commit-config.yaml

@@ -30,17 +30,16 @@ repos:
       - id: detect-private-key
       - id: end-of-file-fixer
         exclude_types: [svg]
-        exclude: ^patches/.*\.patch$|\.scope$
+        exclude: patches/.*\.patch
       - id: fix-byte-order-marker
-      - id: forbid-submodules
       - id: mixed-line-ending
       - id: trailing-whitespace
         # Trailing whitespace breaks yaml files if you use a multiline string
         # with a line that has trailing white space. Many of our recorded
         # tests use strings with trailing white space to represent the final
         # document contents. For example
         # packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/ruby/changeCondition.yml
-        exclude: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$|\.scope$|/generated/|^patches/
+        exclude: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$
   - repo: local
     hooks:
       - id: eslint
@@ -63,24 +62,24 @@ repos:
         name: format-recorded-tests
         files: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$
         language: system
-        entry: pnpm exec ./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts
+        entry: pnpm exec tsx --conditions=cursorless:bundler packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts
   - repo: local
     hooks:
       - id: check-recorded-test-marks
         name: check-recorded-test-marks
         files: ^packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/.*/[^/]*\.yml$
         language: system
-        entry: pnpm exec ./packages/common/scripts/my-ts-node.js packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts --check-marks
-  - repo: https://github.com/ikamensh/flynt
-    rev: "1.0.1"
+        entry: pnpm exec tsx --conditions=cursorless:bundler packages/cursorless-engine/src/scripts/transformRecordedTests/index.ts --check-marks
+  - repo: https://github.com/ikamensh/flynt/
+    rev: "0.78"
     hooks:
       - id: flynt
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.11
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: "v0.0.260"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.1.1
+  - repo: https://github.com/psf/black
+    rev: 23.3.0
     hooks:
       - id: black

.prettierignore

@@ -1,5 +1,4 @@
 **/vendor
-**/generated
 
 # We use our own format for our recorded yaml tests to keep them compact
 /packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/**/*.yml

.vscode/launch.json

@@ -34,7 +34,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/runners/extensionTests"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "${defaultBuildTask}",
@@ -55,7 +55,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/runners/extensionTests"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "Prepare test subset",
@@ -68,7 +68,7 @@
       "name": "Talon tests",
       "type": "node",
       "request": "launch",
-      "program": "${workspaceFolder}/packages/test-harness/dist/runTalonTests.cjs",
+      "program": "${workspaceFolder}/packages/test-harness/out/scripts/runTalonTests",
       "env": {
         "CURSORLESS_TEST": "true",
         "CURSORLESS_REPO_ROOT": "${workspaceFolder}"
@@ -84,7 +84,7 @@
       "name": "Talon tests subset",
       "type": "node",
       "request": "launch",
-      "program": "${workspaceFolder}/packages/test-harness/dist/runTalonTests.cjs",
+      "program": "${workspaceFolder}/packages/test-harness/out/scripts/runTalonTests",
       "env": {
         "CURSORLESS_TEST": "true",
         "CURSORLESS_RUN_TEST_SUBSET": "true",
@@ -101,7 +101,7 @@
       "name": "Unit tests only",
       "type": "node",
       "request": "launch",
-      "program": "${workspaceFolder}/packages/test-harness/dist/runUnitTestsOnly.cjs",
+      "program": "${workspaceFolder}/packages/test-harness/out/scripts/runUnitTestsOnly",
       "env": {
         "CURSORLESS_TEST": "true",
         "CURSORLESS_REPO_ROOT": "${workspaceFolder}"
@@ -125,7 +125,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/runners/extensionTests"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "${defaultBuildTask}",
@@ -147,7 +147,7 @@
       "args": [
         "--profile=cursorlessDevelopment",
         "--extensionDevelopmentPath=${workspaceFolder}/packages/cursorless-vscode/dist",
-        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/dist/extensionTests.cjs"
+        "--extensionTestsPath=${workspaceFolder}/packages/test-harness/out/runners/extensionTests"
       ],
       "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
       "preLaunchTask": "${defaultBuildTask}",
@@ -156,23 +156,6 @@
         "!**/node_modules/**"
       ]
     },
-    {
-      "name": "Update fixtures, unit tests only",
-      "type": "node",
-      "request": "launch",
-      "program": "${workspaceFolder}/packages/test-harness/dist/runUnitTestsOnly.cjs",
-      "env": {
-        "CURSORLESS_TEST": "true",
-        "CURSORLESS_TEST_UPDATE_FIXTURES": "true",
-        "CURSORLESS_REPO_ROOT": "${workspaceFolder}"
-      },
-      "outFiles": ["${workspaceFolder}/**/out/**/*.js"],
-      "preLaunchTask": "${defaultBuildTask}",
-      "resolveSourceMapLocations": [
-        "${workspaceFolder}/**",
-        "!**/node_modules/**"
-      ]
-    },
     {
       "name": "Docusaurus start",
       "type": "node",