Revert in correct type changes

Author: AndreasArvidsson

packages/common/src/util/uniqWithHash.ts

@@ -51,7 +51,7 @@ export function uniqWithHash<T>(
   // For hash collisions, uniq the items,
   // letting uniqWith provide correct semantics.
   needsUniq.forEach((key) => {
-    hashToItems.set(key, uniqWith(hashToItems.get(key) ?? [], isEqual));
+    hashToItems.set(key, uniqWith(hashToItems.get(key), isEqual));
   });
 
   // To preserve order, step through the original items

packages/cursorless-engine/src/generateSpokenForm/generateSpokenForm.test.ts

@@ -50,9 +50,7 @@ suite("Generate spoken forms", () => {
       regex: "foo",
     });
 
-    if (spokenForm.type !== "success") {
-      assert.fail("Expected spoken form generation to succeed");
-    }
+    assert(spokenForm.type === "success");
     assert.equal(spokenForm.spokenForms, "bar");
   });
 });
@@ -77,9 +75,7 @@ async function runTest(file: string) {
     const hatMapSpokenForm = generator.processCommand(
       getHatMapCommand(fixture.marksToCheck),
     );
-    if (hatMapSpokenForm.type !== "success") {
-      assert.fail("Expected hat map spoken form generation to succeed");
-    }
+    assert(hatMapSpokenForm.type === "success");
     assert(hatMapSpokenForm.spokenForms.length === 1);
     generatedSpokenForm.spokenForms[0] += " " + hatMapSpokenForm.spokenForms[0];
   }

packages/cursorless-engine/src/test/spokenForms.talon.test.ts

@@ -63,9 +63,7 @@ async function runRecordedFixture(repl: TalonRepl, file: string) {
     commands.push(getHatMapCommand(fixture.marksToCheck));
   }
 
-  if (fixture.command.spokenForm == null) {
-    assert.fail("Expected spoken form to be defined");
-  }
+  assert(fixture.command.spokenForm != null);
 
   await runTest(repl, fixture.command.spokenForm, commands);
 }

packages/cursorless-tutorial/src/stepComponentParsers/CursorlessCommandComponentParser.ts

@@ -115,9 +115,8 @@ function substituteMissingHats(
 
   // Update the hats in the initial state snapshot
   if (initialState.marks != null) {
-    const { marks } = initialState;
     initialState = produce(initialState, (draft) => {
-      draft.marks = mapKeys(marks, (_value, key) => {
+      draft.marks = mapKeys(draft.marks, (_value, key) => {
         const { hatStyle, character } = splitKey(key);
         if (enabledHatStyles[hatStyle] === undefined) {
           return getKey(Object.keys(enabledHatStyles)[0], character);

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

@@ -34,10 +34,8 @@ async function breakpointAdd() {
 
   const breakpoints = vscode.debug.breakpoints;
   assert.deepStrictEqual(breakpoints.length, 1);
+  assert.ok(breakpoints[0] instanceof vscode.SourceBreakpoint);
   const breakpoint = breakpoints[0];
-  if (!(breakpoint instanceof vscode.SourceBreakpoint)) {
-    assert.fail("Expected breakpoint to be a SourceBreakpoint");
-  }
   assert.ok(breakpoint.location.range.isEqual(new vscode.Range(0, 0, 0, 0)));
 }
 
@@ -49,10 +47,8 @@ async function breakpointTokenAdd() {
 
   const breakpoints = vscode.debug.breakpoints;
   assert.deepStrictEqual(breakpoints.length, 1);
+  assert.ok(breakpoints[0] instanceof vscode.SourceBreakpoint);
   const breakpoint = breakpoints[0];
-  if (!(breakpoint instanceof vscode.SourceBreakpoint)) {
-    assert.fail("Expected breakpoint to be a SourceBreakpoint");
-  }
   assert.ok(breakpoint.location.range.isEqual(new vscode.Range(0, 2, 0, 7)));
 }
 
@@ -94,10 +90,8 @@ async function breakpointTokenRemove() {
 
   const breakpoints = vscode.debug.breakpoints;
   assert.deepStrictEqual(breakpoints.length, 1);
+  assert.ok(breakpoints[0] instanceof vscode.SourceBreakpoint);
   const breakpoint = breakpoints[0];
-  if (!(breakpoint instanceof vscode.SourceBreakpoint)) {
-    assert.fail("Expected breakpoint to be a SourceBreakpoint");
-  }
   assert.ok(breakpoint.location.range.isEqual(new vscode.Range(0, 0, 0, 0)));
 }
 

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

@@ -47,9 +47,6 @@ async function runTest() {
 
   const editor = window.activeTextEditor;
 
-  if (editor == null) {
-    assert.fail("No editor was focused");
-  }
-
+  assert.ok(editor != null, "No editor was focused");
   assert.deepStrictEqual(editor.document.getText(editor.selection), "world");
 }

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

@@ -31,9 +31,7 @@ async function runTest() {
     );
   });
 
-  if (targetHat == null) {
-    assert.fail('Expected a default hat for "world" in the cell');
-  }
+  assert(targetHat != null, 'Expected a default hat for "world" in the cell');
   const { hatStyle, character } = splitKey(targetHat[0]);
 
   await runCursorlessCommand({
@@ -54,9 +52,7 @@ async function runTest() {
 
   const editor = window.activeTextEditor;
 
-  if (editor == null) {
-    assert.fail("No editor was focused");
-  }
+  assert.ok(editor != null, "No editor was focused");
 
   assert.deepStrictEqual(editor.document.getText(editor.selection), "world");
 }

packages/node-common/src/FileSystemTutorialContentProvider.ts

@@ -3,7 +3,6 @@ import type {
   TutorialContentProvider,
   TutorialId,
 } from "@cursorless/common";
-import type { Dirent } from "node:fs";
 import { readFile, readdir } from "node:fs/promises";
 import path from "path";
 import { loadFixture } from "./loadFixture";
@@ -22,10 +21,8 @@ export class FileSystemTutorialContentProvider implements TutorialContentProvide
 
     return await Promise.all(
       tutorialDirs
-        .filter((dirent: Dirent) => dirent.isDirectory())
-        .map((dirent: Dirent) =>
-          this.loadTutorialScript(dirent.name as TutorialId),
-        ),
+        .filter((dirent) => dirent.isDirectory())
+        .map((dirent) => this.loadTutorialScript(dirent.name as TutorialId)),
     );
   }
 

packages/node-common/src/walkAsync.ts

@@ -1,4 +1,3 @@
-import type { Dirent } from "node:fs";
 import * as path from "path";
 import { readdir } from "fs/promises";
 import { flatten } from "lodash-es";
@@ -18,7 +17,7 @@ export const walkFiles = async (
 
   const files = flatten(
     await Promise.all(
-      dirEntries.map(async (dirent: Dirent) => {
+      dirEntries.map(async (dirent) => {
         const filePath = path.join(dir, dirent.name);
         return dirent.isDirectory() ? await walkFiles(filePath) : [filePath];
       }),

packages/node-common/src/walkSync.ts

@@ -1,4 +1,3 @@
-import type { Dirent } from "node:fs";
 import * as path from "path";
 import { readdirSync } from "fs";
 
@@ -11,7 +10,7 @@ import { readdirSync } from "fs";
  */
 export const walkFilesSync = (dir: string): string[] => {
   let filelist: string[] = [];
-  readdirSync(dir, { withFileTypes: true }).forEach((dirent: Dirent) => {
+  readdirSync(dir, { withFileTypes: true }).forEach((dirent) => {
     const filePath = path.join(dir, dirent.name);
     if (dirent.isDirectory()) {
       filelist = filelist.concat(walkFilesSync(filePath));
@@ -32,7 +31,7 @@ export const walkDirsSync = (dir: string): string[] => {
   // Inner function returns absolute paths
   const walkDirsSyncInner = (dir: string): string[] => {
     let dirlist: string[] = [];
-    readdirSync(dir, { withFileTypes: true }).forEach((dirent: Dirent) => {
+    readdirSync(dir, { withFileTypes: true }).forEach((dirent) => {
       if (dirent.isDirectory()) {
         const dirPath = path.join(dir, dirent.name);
         dirlist.push(dirPath);