Replace glob with fast glob

cursorless.nvim/node/command-server/package.json

@@ -19,7 +19,7 @@
     "@typescript-eslint/parser": "^8.32.1",
     "esbuild": "^0.27.4",
     "eslint": "^10.0.0",
-    "glob": "^13.0.0",
+    "fast-glob": "^3.3.3",
     "mocha": "^8.1.3",
     "neovim": "^5.0.1",
     "typescript": "^5.8.3",

packages/app-neovim/package.json

@@ -7,7 +7,7 @@
   "main": "./out/index.cjs",
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build",
     "dev": "pnpm run compile:dev && pnpm run populate-dist",
     "build": "pnpm run compile:prod && pnpm run populate-dist",
     "compile:prod": "pnpm run compile:base --minify",

packages/app-talonjs/package.json

@@ -7,7 +7,7 @@
   "type": "module",
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build",
     "dev": "pnpm run compile:watch",
     "build": "pnpm run compile:prod",
     "compile:prod": "pnpm run compile:base --minify src/mainProduction.ts",

packages/app-vscode/package.json

@@ -1282,7 +1282,7 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build",
     "test": "pnpm ensure-grammar-up-to-date",
     "dev": "pnpm generate-grammar && pnpm run compile:dev && pnpm run bundle:dev && pnpm run populate-dist",
     "build": "pnpm generate-grammar && pnpm run compile:prod && pnpm run bundle:prod && pnpm run populate-dist",
@@ -1315,7 +1315,7 @@
     "@cursorless/lib-test-case-recorder": "workspace:*",
     "@cursorless/lib-tutorial": "workspace:*",
     "@cursorless/lib-vscode-common": "workspace:*",
-    "glob": "^13.0.6",
+    "fast-glob": "^3.3.3",
     "itertools": "^2.6.0",
     "lodash-es": "^4.17.23",
     "nearley": "^2.20.1",

packages/app-vscode/src/InstallationDependencies.ts

@@ -1,6 +1,6 @@
 import { isWindows } from "@cursorless/lib-node-common";
 import { COMMAND_SERVER_EXTENSION_ID } from "@cursorless/lib-vscode-common";
-import { globSync } from "glob";
+import glob from "fast-glob";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
@@ -130,9 +130,14 @@ function talonHomeExists() {
 
 function cursorlessTalonExists() {
   const talonUserPath = path.join(getTalonHomePath(), "user");
-  const files = globSync("**/*/src/cursorless.talon", {
+
+  if (!fs.existsSync(talonUserPath)) {
+    return false;
+  }
+
+  const files = glob.sync("**/*/src/cursorless.talon", {
     cwd: talonUserPath,
-    maxDepth: 3,
+    deep: 3,
   });
   return files.length > 0;
 }

packages/app-web-docs/package.json

@@ -18,7 +18,7 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "docusaurus clear && rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "clean": "docusaurus clear && rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build",
     "dev": "docusaurus start",
     "build": "docusaurus build"
   },

packages/app-web/package.json

@@ -7,7 +7,7 @@
   "type": "module",
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build",
     "dev": "env NODE_OPTIONS=--import=tsx vite serve",
     "build": "env NODE_OPTIONS=--import=tsx vite build"
   },

packages/lib-cheatsheet-local/package.json

@@ -7,7 +7,7 @@
   "type": "module",
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build",
     "test": "jest",
     "dev": "env NODE_OPTIONS=--import=tsx vite serve",
     "bundle:prod": "env NODE_OPTIONS=--import=tsx vite build",

packages/lib-cheatsheet/package.json

@@ -13,7 +13,7 @@
   ],
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build",
     "test": "jest"
   },
   "dependencies": {

packages/lib-common/package.json

@@ -14,7 +14,7 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "itertools": "^2.6.0",

packages/lib-engine/package.json

@@ -9,7 +9,7 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build",
     "test": "pnpm ensure-grammar-up-to-date",
     "generate-grammar:base": "nearleyc src/customCommandGrammar/grammar.ne",
     "ensure-grammar-up-to-date": "pnpm -s generate-grammar:base | diff -u src/customCommandGrammar/generated/grammar.ts -",

packages/lib-neovim-common/package.json

@@ -9,7 +9,7 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/lib-common": "workspace:*",

packages/lib-neovim-registry/package.json

@@ -9,7 +9,7 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build"
   },
   "devDependencies": {
     "neovim": "^5.4.0"

packages/lib-node-common/package.json

@@ -9,11 +9,11 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/lib-common": "workspace:*",
-    "glob": "^13.0.6",
+    "fast-glob": "^3.3.3",
     "immer": "^11.1.4",
     "lodash-es": "^4.17.23",
     "node-html-parser": "^7.1.0"

packages/lib-node-common/src/FileSystemCommandHistoryStorage.ts

@@ -2,7 +2,7 @@ import type {
   CommandHistoryEntry,
   CommandHistoryStorage,
 } from "@cursorless/lib-common";
-import { glob } from "glob";
+import glob from "fast-glob";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 
@@ -24,6 +24,8 @@ export class FileSystemCommandHistoryStorage implements CommandHistoryStorage {
       cwd: this.dir,
     });
 
+    files.sort();
+
     const entries: CommandHistoryEntry[] = [];
 
     for (const file of files) {

packages/lib-sentence-parser/package.json

@@ -9,7 +9,7 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10",

packages/lib-talonjs-core/package.json

@@ -9,7 +9,7 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/lib-common": "workspace:*",

packages/lib-test-case-recorder/package.json

@@ -9,13 +9,13 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/lib-common": "workspace:*",
     "@cursorless/lib-engine": "workspace:*",
     "@cursorless/lib-node-common": "workspace:*",
-    "glob": "^13.0.6",
+    "fast-glob": "^3.3.3",
     "immutability-helper": "^3.1.1",
     "lodash-es": "^4.17.23"
   },

packages/lib-tutorial/package.json

@@ -9,7 +9,7 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/lib-common": "workspace:*",

packages/lib-vscode-common/package.json

@@ -9,7 +9,7 @@
   },
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/lib-common": "workspace:*"

packages/lib-vscode-tutorial-webview/package.json

@@ -7,7 +7,7 @@
   "type": "module",
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build",
     "dev": "env NODE_OPTIONS=--import=tsx vite serve",
     "bundle:prod": "env NODE_OPTIONS=--import=tsx vite build",
     "bundle:dev": "env NODE_OPTIONS=--import=tsx vite build --mode development",

packages/test-neovim-e2e/package.json

@@ -7,7 +7,7 @@
   "type": "module",
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/lib-common": "workspace:*",

packages/test-runner/package.json

@@ -8,7 +8,7 @@
   "main": "./out/extensionTestsNeovim.cjs",
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build",
     "test": "c-tsx ./src/scripts/runUnitTests.ts",
     "test:subset": "c-tsx ./src/scripts/runUnitTests.ts --subset",
     "test:update": "c-tsx ./src/scripts/runUnitTests.ts --update",
@@ -26,7 +26,7 @@
     "@cursorless/lib-neovim-common": "workspace:*",
     "@cursorless/lib-neovim-registry": "workspace:*",
     "@cursorless/lib-node-common": "workspace:*",
-    "glob": "^13.0.6",
+    "fast-glob": "^3.3.3",
     "neovim": "^5.4.0",
     "tail": "^2.2.6"
   },

packages/test-runner/src/runAllTests.ts

@@ -1,5 +1,5 @@
 import { getCursorlessRepoRoot } from "@cursorless/lib-node-common";
-import { glob } from "glob";
+import glob from "fast-glob";
 import Mocha from "mocha";
 import * as path from "node:path";
 import {
@@ -34,7 +34,7 @@ export function runAllTests(type: TestType): Promise<void> {
   const testRoot = path.join(getCursorlessRepoRoot(), "packages");
 
   let filePattern: string;
-  let ignore: string[] | undefined = undefined;
+  let ignore: string[] = [];
 
   switch (type) {
     case TestType.unit:
@@ -64,7 +64,7 @@ export function runAllTests(type: TestType): Promise<void> {
 async function runTestsInDir(
   testRoot: string,
   filePattern: string,
-  ignore: string[] | undefined,
+  ignore: string[],
 ): Promise<void> {
   // Create the mocha test
   const mocha = new Mocha({
@@ -75,7 +75,8 @@ async function runTestsInDir(
 
   const files = await glob(`**/*.${filePattern}`, {
     cwd: testRoot,
-    ignore,
+    followSymbolicLinks: false,
+    ignore: ["**/node_modules/**", ...ignore],
   });
 
   if (files.length === 0) {

packages/test-talon-e2e/package.json

@@ -7,7 +7,7 @@
   "type": "module",
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build",
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build",
     "test:quickjs": "bash ./scripts/test-quickjs.sh"
   },
   "dependencies": {

packages/test-vscode-e2e/package.json

@@ -7,7 +7,7 @@
   "type": "module",
   "scripts": {
     "typecheck": "tsc",
-    "clean": "rm -rf ./out tsconfig.tsbuildinfo ./dist ./build"
+    "clean": "rm -rf ./out ./tsconfig.tsbuildinfo ./dist ./build"
   },
   "dependencies": {
     "@cursorless/lib-common": "workspace:*",

packages/test-vscode-e2e/src/suite/crossCellsSetSelection.vscode.test.ts

@@ -1,33 +1,38 @@
-import { LATEST_VERSION } from "@cursorless/lib-common";
-import { isLinux } from "@cursorless/lib-node-common";
+import { LATEST_VERSION, splitKey } from "@cursorless/lib-common";
 import {
+  getCellIndex,
   getCursorlessApi,
   openNewNotebookEditor,
   runCursorlessCommand,
 } from "@cursorless/lib-vscode-common";
 import assert from "assert";
 import { window } from "vscode";
 import { endToEndTestSetup } from "../endToEndTestSetup";
-import { isCI } from "../isCI";
 
 // Check that setSelection is able to focus the correct cell
 suite("Cross-cell set selection", async function () {
-  // FIXME: This test is flaky on Linux CI, so we skip it there for now
-  if (isCI() && isLinux()) {
-    this.ctx.skip();
-  }
-
   endToEndTestSetup(this);
 
   test("Cross-cell set selection", runTest);
 });
 
 async function runTest() {
-  const { hatTokenMap } = (await getCursorlessApi()).testHelpers!;
+  const { hatTokenMap, toVscodeEditor } = (await getCursorlessApi())
+    .testHelpers!;
 
-  await openNewNotebookEditor(['"hello"', '"world"']);
+  const notebook = await openNewNotebookEditor(['"hello"', '"world"']);
 
   await hatTokenMap.allocateHats();
+  const hatMap = await hatTokenMap.getReadableMap(false);
+  const targetHat = hatMap.getEntries().find(([, token]) => {
+    const editor = toVscodeEditor(token.editor);
+    return (
+      getCellIndex(notebook, editor.document) === 1 && token.text === "world"
+    );
+  });
+
+  assert(targetHat != null, 'Expected a hat for "world" in the second cell');
+  const { hatStyle, character } = splitKey(targetHat[0]);
 
   await runCursorlessCommand({
     version: LATEST_VERSION,
@@ -38,8 +43,8 @@ async function runTest() {
         type: "primitive",
         mark: {
           type: "decoratedSymbol",
-          symbolColor: "default",
-          character: "o",
+          symbolColor: hatStyle,
+          character,
         },
       },
     },