restore

Author: AndreasArvidsson

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

@@ -17,10 +17,10 @@ import { assert } from "chai";
 import { groupBy, uniq } from "lodash-es";
 import { promises as fsp } from "node:fs";
 import { endToEndTestSetup } from "../endToEndTestSetup";
-// import {
-//   serializeIterationScopeFixture,
-//   serializeScopeFixture,
-// } from "./serializeScopeFixture";
+import {
+  serializeIterationScopeFixture,
+  serializeScopeFixture,
+} from "./serializeScopeFixture";
 
 suite("Scope test cases", async function () {
   endToEndTestSetup(this);
@@ -123,43 +123,33 @@ async function runTest(file: string, languageId: string, facetId: string) {
 
   const editor = ide.activeTextEditor!;
 
-  if (editor == null) {
-    console.log("editor" == null);
-  }
+  const outputFixture = ((): string => {
+    const config = {
+      visibleOnly: false,
+      scopeType,
+    };
+
+    if (isIteration) {
+      const iterationScopes = scopeProvider.provideIterationScopeRanges(
+        editor,
+        {
+          ...config,
+          includeNestedTargets: false,
+        },
+      );
+      return serializeIterationScopeFixture(code, iterationScopes);
+    }
 
-  if (!scopeProvider && !scopeType && !isIteration && !code && !ide) {
-    console.log("weird");
-  }
+    const scopes = scopeProvider.provideScopeRanges(editor, config);
 
-  //   const outputFixture = ((): string => {
-  //     const config = {
-  //       visibleOnly: false,
-  //       scopeType,
-  //     };
-
-  //     if (isIteration) {
-  //       const iterationScopes = scopeProvider.provideIterationScopeRanges(
-  //         editor,
-  //         {
-  //           ...config,
-  //           includeNestedTargets: false,
-  //         },
-  //       );
-  //       return serializeIterationScopeFixture(code, iterationScopes);
-  //     }
-
-  //     const scopes = scopeProvider.provideScopeRanges(editor, config);
-
-  //     return serializeScopeFixture(facetId, code, scopes);
-  //   })();
-
-  assert.ok(true);
-
-  //   if (shouldUpdateFixtures()) {
-  //     await fsp.writeFile(file, outputFixture);
-  //   } else {
-  //     assert.equal(outputFixture, fixture);
-  //   }
+    return serializeScopeFixture(facetId, code, scopes);
+  })();
+
+  if (shouldUpdateFixtures()) {
+    await fsp.writeFile(file, outputFixture);
+  } else {
+    assert.equal(outputFixture, fixture);
+  }
 }
 
 function getFacetInfo(

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

@@ -19,22 +19,22 @@ export async function openNewEditor(
     content,
   });
 
-  //   await (await getParseTreeApi()).loadLanguage(languageId);
+  await (await getParseTreeApi()).loadLanguage(languageId);
 
   const editor = await vscode.window.showTextDocument(
     document,
     openBeside ? vscode.ViewColumn.Beside : undefined,
   );
 
-  //   const eol = content.includes("\r\n")
-  //     ? vscode.EndOfLine.CRLF
-  //     : vscode.EndOfLine.LF;
-  //   if (eol !== editor.document.eol) {
-  //     await editor.edit((editBuilder) => editBuilder.setEndOfLine(eol));
-  //   }
+  const eol = content.includes("\r\n")
+    ? vscode.EndOfLine.CRLF
+    : vscode.EndOfLine.LF;
+  if (eol !== editor.document.eol) {
+    await editor.edit((editBuilder) => editBuilder.setEndOfLine(eol));
+  }
 
   // Many times running these tests opens the sidebar, which slows performance. Close it.
-  //   vscode.commands.executeCommand("workbench.action.closeSidebar");
+  vscode.commands.executeCommand("workbench.action.closeSidebar");
 
   return editor;
 }