Check if editor is opened

Author: AndreasArvidsson

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
       VSCODE_LOGS_DIR: ${{ github.workspace }}/artifacts/logs
       CURSORLESS_REPO_ROOT: ${{ github.workspace }}
       TEMP_DIR: ${{ github.workspace }}/temp
-      NODE_OPTIONS: "--max-old-space-size=4096 --force-node-api-uncaught-exceptions-policy=true"
+      NODE_OPTIONS: "--max-old-space-size=4096"
 
     steps:
       - name: Checkout repository

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

@@ -5,7 +5,7 @@ import {
 } from "@cursorless/vscode-common";
 import assert from "assert";
 import { window } from "vscode";
-import { endToEndTestSetup, sleepWithBackoff } from "../endToEndTestSetup";
+import { endToEndTestSetup } from "../endToEndTestSetup";
 
 // Check that setSelection is able to focus the correct cell
 suite("Cross-cell set selection", async function () {
@@ -19,10 +19,6 @@ async function runTest() {
 
   await openNewNotebookEditor(['"hello"', '"world"']);
 
-  // FIXME: There seems to be some timing issue when you create a notebook
-  // editor
-  await sleepWithBackoff(1000);
-
   await hatTokenMap.allocateHats();
 
   await runCursorlessCommand({

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

@@ -28,10 +28,6 @@ async function runTest(
   const { hatTokenMap } = (await getCursorlessApi()).testHelpers!;
   const notebook = await openNewNotebookEditor(["hello"]);
 
-  // FIXME: There seems to be some timing issue when you create a notebook
-  // editor
-  await sleepWithBackoff(500);
-
   await hatTokenMap.allocateHats();
 
   assert.equal(notebook.cellCount, 1);

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

@@ -1,11 +1,11 @@
 import {
   getCursorlessApi,
   openNewNotebookEditor,
+  runCursorlessCommand,
 } from "@cursorless/vscode-common";
 import assert from "assert";
 import { window } from "vscode";
-import { endToEndTestSetup, sleepWithBackoff } from "../endToEndTestSetup";
-import { runCursorlessCommand } from "@cursorless/vscode-common";
+import { endToEndTestSetup } from "../endToEndTestSetup";
 
 // Check that setSelection is able to focus the correct cell
 suite("Within cell set selection", async function () {
@@ -19,10 +19,6 @@ async function runTest() {
 
   await openNewNotebookEditor(['"hello world"']);
 
-  // FIXME: There seems to be some timing issue when you create a notebook
-  // editor
-  await sleepWithBackoff(1000);
-
   await hatTokenMap.allocateHats();
 
   await runCursorlessCommand({
@@ -40,7 +36,7 @@ async function runTest() {
     ],
   });
 
-  const editor = window.activeTextEditor; // eslint-disable-line no-restricted-properties
+  const editor = window.activeTextEditor;
 
   if (editor == null) {
     assert(false, "No editor was focused");

packages/test-harness/src/launchVscodeAndRunTests.ts

@@ -85,10 +85,6 @@ export async function launchVscodeAndRunTests(extensionTestsPath: string) {
         useLegacyVscode || os.platform() === "win32"
           ? undefined
           : [`--crash-reporter-directory=${crashDir}`, `--logsPath=${logsDir}`],
-      extensionTestsEnv: {
-        ["NODE_OPTIONS"]:
-          "--max-old-space-size=4096 --force-node-api-uncaught-exceptions-policy=true",
-      },
     });
 
     console.log(`Returned from "runTests" with value: ${code}`);

packages/test-harness/src/runAllTests.ts

@@ -71,11 +71,6 @@ async function runTestsInDir(
   // Add files to the test suite
   files.forEach((f) => mocha.addFile(path.resolve(testRoot, f)));
 
-  console.log(`Running tests in ${testRoot} for ${files.length} files`);
-  console.log(JSON.stringify(process.argv, null, 2));
-  console.log(JSON.stringify(process.execArgv, null, 2));
-  console.log(JSON.stringify(process.env, null, 2));
-
   try {
     // Run the mocha test
     await new Promise<void>((resolve, reject) => {

packages/vscode-common/src/testUtil/openNewEditor.ts

@@ -96,5 +96,27 @@ export async function openNewNotebookEditor(
 
   await (await getParseTreeApi()).loadLanguage(language);
 
+  // FIXME: There seems to be some timing issue when you create a notebook
+  // editor
+  await waitForEditorToOpen();
+
   return document;
 }
+
+function waitForEditorToOpen() {
+  return new Promise<void>((resolve, reject) => {
+    let count = 0;
+    const interval = setInterval(() => {
+      if (vscode.window.activeTextEditor != null) {
+        clearInterval(interval);
+        resolve();
+      } else {
+        count++;
+        if (count === 20) {
+          clearInterval(interval);
+          reject("Timed out waiting for editor to open");
+        }
+      }
+    }, 100);
+  });
+}