Merge branch 'main' into csharpScopes2

Author: AndreasArvidsson

.github/workflows/test.yml

@@ -100,13 +100,15 @@ jobs:
         env:
           NEOVIM_PATH: ${{ steps.vim.outputs.executable }}
 
-      - name: Run neovim lua tests (Linux)
-        uses: ./.github/actions/test-neovim-lua/
-        if: runner.os == 'Linux' && matrix.app_version == 'stable'
-
-      - name: Run neovim lua lint (Linux)
-        uses: ./.github/actions/lint-lua-ls/
-        if: runner.os == 'Linux' && matrix.app_version == 'stable'
+      # FIXME: Re-enable neovim lua tests
+      # https://github.com/cursorless-dev/cursorless/issues/2946
+      # - name: Run neovim lua tests (Linux)
+      #   uses: ./.github/actions/test-neovim-lua/
+      #   if: runner.os == 'Linux' && matrix.app_version == 'stable'
+
+      # - name: Run neovim lua lint (Linux)
+      #   uses: ./.github/actions/lint-lua-ls/
+      #   if: runner.os == 'Linux' && matrix.app_version == 'stable'
 
       - name: Create vscode dist that can be installed locally
         run: pnpm -F @cursorless/cursorless-vscode populate-dist --local-install

packages/cursorless-vscode-e2e/src/isCI.ts

@@ -0,0 +1,3 @@
+export function isCI() {
+  return "CI" in process.env;
+}

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

@@ -1,4 +1,4 @@
-import { sleep } from "@cursorless/common";
+import { isLinux } from "@cursorless/node-common";
 import {
   getCursorlessApi,
   openNewNotebookEditor,
@@ -7,9 +7,15 @@ import {
 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);
@@ -20,8 +26,6 @@ async function runTest() {
 
   await openNewNotebookEditor(['"hello"', '"world"']);
 
-  await sleep(200);
-
   await hatTokenMap.allocateHats();
 
   await runCursorlessCommand({

packages/node-common/src/index.ts

@@ -5,7 +5,7 @@ export * from "./FileSystemTutorialContentProvider";
 export * from "./getCursorlessRepoRoot";
 export * from "./getFixturePaths";
 export * from "./getScopeTestPathsRecursively";
-export * from "./isWindows";
+export * from "./isOS";
 export * from "./loadFixture";
 export * from "./nodeGetRunMode";
 export * from "./runRecordedTest";

packages/node-common/src/isWindows.ts renamed to packages/node-common/src/isOS.ts

@@ -3,3 +3,7 @@ import * as os from "node:os";
 export function isWindows() {
   return os.platform() === "win32";
 }
+
+export function isLinux() {
+  return os.platform() === "linux";
+}