enabled unicorn/import-style lint rule (#3287)

Author: AndreasArvidsson

oxlint.config.mts

@@ -2,10 +2,6 @@ import type { OxlintConfig } from "oxlint";
 import { defineConfig } from "oxlint";
 
 const disabledRules = [
-  // Temporarily disabled
-  "eslint/prefer-named-capture-group",
-  "unicorn/import-style",
-
   "eslint/arrow-body-style",
   "eslint/capitalized-comments",
   "eslint/class-methods-use-this",
@@ -33,6 +29,7 @@ const disabledRules = [
   "eslint/no-use-before-define",
   "eslint/no-void",
   "eslint/prefer-destructuring",
+  "eslint/prefer-named-capture-group",
   "eslint/sort-imports",
   "eslint/sort-keys",
   "eslint/sort-vars",

packages/app-talonjs/src/extension.ts

@@ -1,4 +1,4 @@
-import * as talon from "talon";
+import talon from "talon";
 import type { RunMode } from "@cursorless/lib-common";
 import { activate as activateCore } from "@cursorless/lib-talonjs-core";
 

packages/app-vscode/src/InstallationDependencies.ts

@@ -1,8 +1,8 @@
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
 import glob from "fast-glob";
-import * as vscode from "vscode";
+import vscode from "vscode";
 import { isWindows } from "@cursorless/lib-node-common";
 import { COMMAND_SERVER_EXTENSION_ID } from "@cursorless/lib-vscode-common";
 

packages/app-vscode/src/ReleaseNotes.test.ts

@@ -1,4 +1,4 @@
-import * as sinon from "sinon";
+import { fake, restore, assert, match } from "sinon";
 import type { ExtensionContext, Uri } from "vscode";
 import type { MessageType, Messages } from "@cursorless/lib-common";
 import { asyncSafety } from "@cursorless/lib-common";
@@ -154,7 +154,7 @@ const testCases: TestCase[] = [
 
 suite("release notes", () => {
   teardown(() => {
-    sinon.restore();
+    restore();
   });
 
   for (const { input, expectedOutput } of testCases) {
@@ -192,36 +192,36 @@ async function runTest(input: Input, expectedOutput: Output) {
   await new ReleaseNotes(vscodeApi, extensionContext, messages).maybeShow();
 
   if (expectedOutput.storedVersion === false) {
-    sinon.assert.notCalled(update);
+    assert.notCalled(update);
   } else {
-    sinon.assert.calledOnceWithExactly(
+    assert.calledOnceWithExactly(
       update,
       VERSION_KEY,
       expectedOutput.storedVersion,
     );
   }
 
   if (expectedOutput.showedMessage) {
-    sinon.assert.calledOnceWithExactly(
+    assert.calledOnceWithExactly(
       showMessage,
-      sinon.match.any,
+      match.any,
       "releaseNotes",
-      sinon.match.any,
-      sinon.match.any,
+      match.any,
+      match.any,
     );
 
     if (expectedOutput.openedUrl) {
-      sinon.assert.calledOnce(openExternal);
+      assert.calledOnce(openExternal);
     } else {
-      sinon.assert.notCalled(openExternal);
+      assert.notCalled(openExternal);
     }
   } else {
-    sinon.assert.notCalled(showMessage);
+    assert.notCalled(showMessage);
   }
 }
 
 function getFakes(input: Input) {
-  const openExternal = sinon.fake.resolves<[Uri], Promise<boolean>>(true);
+  const openExternal = fake.resolves<[Uri], Promise<boolean>>(true);
   const vscodeApi = {
     window: {
       state: {
@@ -233,7 +233,7 @@ function getFakes(input: Input) {
     },
   } as unknown as VscodeApi;
 
-  const update = sinon.fake<[string, string], Promise<void>>();
+  const update = fake<[string, string], Promise<void>>();
   const extensionContext = {
     globalState: {
       get() {
@@ -248,7 +248,7 @@ function getFakes(input: Input) {
     },
   } as unknown as ExtensionContext;
 
-  const showMessage = sinon.fake.resolves<
+  const showMessage = fake.resolves<
     [MessageType, string, string, ...string[]],
     Promise<string | undefined>
   >(input.pressedButton ? WHATS_NEW : undefined);

packages/app-vscode/src/ReleaseNotes.ts

@@ -1,4 +1,4 @@
-import * as semver from "semver";
+import semver from "semver";
 import type { ExtensionContext } from "vscode";
 import { URI } from "vscode-uri";
 import type { Messages } from "@cursorless/lib-common";

packages/app-vscode/src/StatusBarItem.ts

@@ -1,4 +1,4 @@
-import * as vscode from "vscode";
+import vscode from "vscode";
 
 const DEFAULT_TEXT = "$(cursorless-icon) Cursorless";
 

packages/app-vscode/src/VscodeSnippets.ts

@@ -1,5 +1,5 @@
 import { open } from "node:fs/promises";
-import { join } from "node:path";
+import path from "node:path";
 import type { IDE, TextEditor } from "@cursorless/lib-common";
 import type { Snippets } from "@cursorless/lib-engine";
 import { isEexistError } from "@cursorless/lib-node-common";
@@ -11,7 +11,7 @@ export class VscodeSnippets implements Snippets {
     snippetName: string,
     directory: string,
   ): Promise<TextEditor> {
-    const snippetPath = join(directory, `${snippetName}.snippet`);
+    const snippetPath = path.join(directory, `${snippetName}.snippet`);
     await createNewFile(snippetPath);
     return this.ide.openTextDocument(snippetPath);
   }

packages/app-vscode/src/commands.ts

@@ -1,4 +1,4 @@
-import * as vscode from "vscode";
+import vscode from "vscode";
 import { CURSORLESS_ORG_URL, DOCS_URL } from "@cursorless/lib-common";
 
 export const showDocumentation = () => {

packages/app-vscode/src/createVscodeIde.ts

@@ -1,6 +1,6 @@
-import * as crypto from "node:crypto";
-import * as os from "node:os";
-import * as path from "node:path";
+import crypto from "node:crypto";
+import os from "node:os";
+import path from "node:path";
 import type { ExtensionContext } from "vscode";
 import { FakeFontMeasurements } from "./ide/vscode/hats/FakeFontMeasurements";
 import { FontMeasurementsImpl } from "./ide/vscode/hats/FontMeasurementsImpl";

packages/app-vscode/src/ide/vscode/VscodeCapabilities.ts

@@ -1,5 +1,5 @@
-import * as semver from "semver";
-import * as vscode from "vscode";
+import semver from "semver";
+import vscode from "vscode";
 import type {
   Capabilities,
   CommandCapabilityMap,