Refactor test runner (#3234)

Author: AndreasArvidsson

.vscode/tasks.json

@@ -14,7 +14,7 @@
     },
     {
       "label": "Build extension and tests",
-      "dependsOn": ["Build extension", "Build test harness"],
+      "dependsOn": ["Build extension", "Build test runner"],
       "group": "build"
     },
     {
@@ -29,7 +29,7 @@
 
     // Helper tasks
     {
-      "label": "Build test harness",
+      "label": "Build test runner",
       "type": "npm",
       "script": "build",
       "path": "packages/test-runner",

cursorless.nvim/lua/cursorless/init.lua

@@ -39,7 +39,7 @@ local function register_functions()
   vim.fn["remote#host#RegisterPlugin"]("node", path .. "/node/test-runner/", {
     {
       type = "function",
-      name = "TestHarnessRun",
+      name = "TestRunnerRun",
       sync = false,
       opts = vim.empty_dict(),
     },
@@ -55,7 +55,7 @@ local function load_extensions()
   if os.getenv("CURSORLESS_MODE") == "test" then
     -- make sure cursorless is loaded before starting the tests
     vim.uv.sleep(1000)
-    vim.fn.TestHarnessRun()
+    vim.fn.TestRunnerRun()
   else
     vim.fn.CommandServerLoadExtension()
   end

package.json

@@ -12,17 +12,17 @@
     "build": "pnpm -r build",
     "clean": "pnpm -r clean",
     "typecheck": "pnpm -r typecheck",
-    "fix:prettier": "prettier --write --list-different .",
     "lint:meta": "pnpm run meta-updater --test",
     "lint:syncpack": "syncpack lint",
     "lint:ts": "eslint packages",
-    "lint:prettier": "prettier --check .",
     "lint:style": "stylelint '**/*.{css,scss}' --ignore-path .gitignore",
+    "lint:fmt": "prettier --check .",
     "lint": "pnpm run typecheck && pnpm run lint:meta && pnpm run lint:syncpack && pnpm run lint:ts && pnpm run lint:style",
     "fix:meta": "pnpm run meta-updater && pnpm -r exec prettier --write tsconfig.json package.json",
     "fix:syncpack": "syncpack fix",
     "fix:eslint": "pnpm lint:ts --fix",
     "fix:style": "stylelint '**/*.{css,scss}' --ignore-path .gitignore --fix",
+    "fix:fmt": "prettier --write --list-different .",
     "init-vscode-sandbox": "pnpm -F @cursorless/app-vscode init-launch-sandbox",
     "meta-updater": "env NODE_OPTIONS=--import=tsx meta-updater",
     "preinstall": "npx only-allow pnpm",

packages/app-neovim/scripts/populate-dist.sh

@@ -8,7 +8,7 @@ fi
 echo "CURSORLESS_REPO_ROOT: $CURSORLESS_REPO_ROOT"
 cursorless_nvim_dir="$CURSORLESS_REPO_ROOT/cursorless.nvim"
 cursorless_neovim_node_in_dir="$CURSORLESS_REPO_ROOT/packages/app-neovim"
-test_harness_node_in_dir="$CURSORLESS_REPO_ROOT/packages/test-runner"
+test_runner_node_in_dir="$CURSORLESS_REPO_ROOT/packages/test-runner"
 
 if [[ "${CI:-x}" == "true" ]]; then
   # If running in CI, only copy the necessary files for testing and release
@@ -25,10 +25,10 @@ if [[ "${CI:-x}" == "true" ]]; then
   cp "$cursorless_neovim_node_in_dir/out/index.cjs" "$cursorless_neovim_node_out_dir/out"
 
   # Populate test-runner
-  test_harness_node_out_dir="$cursorless_nvim_dist_dir/node/test-runner"
-  mkdir -p "$test_harness_node_out_dir/out"
-  cp "$test_harness_node_in_dir/package.json" "$test_harness_node_out_dir"
-  cp "$test_harness_node_in_dir/out/extensionTestsNeovim.cjs" "$test_harness_node_out_dir/out"
+  test_runner_node_out_dir="$cursorless_nvim_dist_dir/node/test-runner"
+  mkdir -p "$test_runner_node_out_dir/out"
+  cp "$test_runner_node_in_dir/package.json" "$test_runner_node_out_dir"
+  cp "$test_runner_node_in_dir/out/extensionTestsNeovim.cjs" "$test_runner_node_out_dir/out"
 else
   # Symlink so we inherit the .map files as well, but only if uname doesn't
   # start with "MINGW" (Windows Git Bash)
@@ -43,8 +43,8 @@ else
     rm -rf "$cursorless_neovim_node_out_dir"
     ln -s "$cursorless_neovim_node_in_dir" "$cursorless_neovim_node_out_dir"
 
-    test_harness_node_out_dir="$cursorless_nvim_dir/node/test-runner"
-    rm -rf "$test_harness_node_out_dir"
-    ln -s "$test_harness_node_in_dir" "$test_harness_node_out_dir"
+    test_runner_node_out_dir="$cursorless_nvim_dir/node/test-runner"
+    rm -rf "$test_runner_node_out_dir"
+    ln -s "$test_runner_node_in_dir" "$test_runner_node_out_dir"
   fi
 fi

packages/app-talon/package.json packages/app-talonjs/package.jsonpackages/app-talon/package.json renamed to packages/app-talonjs/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@cursorless/app-talon",
+  "name": "@cursorless/app-talonjs",
   "version": "1.0.0",
   "description": "cursorless in talon js",
   "license": "MIT",
@@ -18,6 +18,6 @@
   },
   "dependencies": {
     "@cursorless/lib-common": "workspace:*",
-    "@cursorless/lib-talon-core": "workspace:*"
+    "@cursorless/lib-talonjs-core": "workspace:*"
   }
 }

packages/app-talon/scripts/esbuild.sh packages/app-talonjs/scripts/esbuild.shpackages/app-talon/scripts/esbuild.sh renamed to packages/app-talonjs/scripts/esbuild.sh

@@ -1,5 +1,5 @@
 import type { RunMode } from "@cursorless/lib-common";
-import { activate as activateCore } from "@cursorless/lib-talon-core";
+import { activate as activateCore } from "@cursorless/lib-talonjs-core";
 import * as talon from "talon";
 
 export async function activate(runMode: RunMode): Promise<void> {

packages/app-talon/src/extension.ts packages/app-talonjs/src/extension.tspackages/app-talon/src/extension.ts renamed to packages/app-talonjs/src/extension.ts

@@ -3,7 +3,7 @@ declare module "talon" {
     TalonActions,
     TalonContextConstructor,
     TalonSettings,
-  } from "@cursorless/lib-talon-core";
+  } from "@cursorless/lib-talonjs-core";
 
   export const actions: TalonActions;
   export const settings: TalonSettings;