Use import/no-duplicates lint rule

eslint.config.mts

@@ -53,6 +53,8 @@ const rootConfig: ConfigWithExtends = {
 
   rules: {
     "import/no-relative-packages": "error",
+    "import/no-duplicates": "error",
+    "unused-imports/no-unused-imports": "error",
     "@typescript-eslint/consistent-type-imports": "error",
     "@typescript-eslint/consistent-type-assertions": [
       "error",
@@ -75,7 +77,6 @@ const rootConfig: ConfigWithExtends = {
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-inferrable-types": "off",
     "@typescript-eslint/no-non-null-assertion": "off",
-    "unused-imports/no-unused-imports": "error",
     "@typescript-eslint/no-unused-vars": [
       "error",
       {

package.json

@@ -32,11 +32,11 @@
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.31.0",
+    "@eslint/js": "^9.32.0",
     "@pnpm/meta-updater": "^2.0.6",
     "@types/node": "^24.1.0",
     "esbuild": "^0.25.8",
-    "eslint": "^9.31.0",
+    "eslint": "^9.32.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",

packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts

@@ -1,5 +1,7 @@
-import type { SimpleScopeTypeType } from "../types/command/PartialTargetDescriptor.types";
-import { type ScopeType } from "../types/command/PartialTargetDescriptor.types";
+import type {
+  ScopeType,
+  SimpleScopeTypeType,
+} from "../types/command/PartialTargetDescriptor.types";
 
 export const scopeSupportFacets = [
   "command",

packages/cursorless-engine/src/CommandHistory.ts

@@ -2,11 +2,11 @@ import type {
   ActionDescriptor,
   CommandComplete,
   CommandHistoryEntry,
+  CommandHistoryStorage,
   CommandServerApi,
   IDE,
   ReadOnlyHatMap,
 } from "@cursorless/common";
-import { type CommandHistoryStorage } from "@cursorless/common";
 import { produce } from "immer";
 import { v4 as uuid } from "uuid";
 import type { CommandRunner } from "./CommandRunner";

packages/cursorless-engine/src/CommandHistoryAnalyzer.ts

@@ -1,10 +1,11 @@
 import type {
   CommandHistoryEntry,
+  CommandHistoryStorage,
   Modifier,
   PartialPrimitiveTargetDescriptor,
   ScopeType,
 } from "@cursorless/common";
-import { showWarning, type CommandHistoryStorage } from "@cursorless/common";
+import { showWarning } from "@cursorless/common";
 import { groupBy, map, sum } from "lodash-es";
 import { canonicalizeAndValidateCommand } from "./core/commandVersionUpgrades/canonicalizeAndValidateCommand";
 import { ide } from "./singletons/ide.singleton";

packages/cursorless-engine/src/core/StoredTargets.ts

@@ -1,7 +1,6 @@
-import { DefaultMap, Notifier } from "@cursorless/common";
-import type { Target } from "../typings/target.types";
 import type { StoredTargetKey } from "@cursorless/common";
-import { storedTargetKeys } from "@cursorless/common";
+import { DefaultMap, Notifier, storedTargetKeys } from "@cursorless/common";
+import type { Target } from "../typings/target.types";
 import { UndoStack } from "./UndoStack";
 
 const MAX_HISTORY_LENGTH = 25;

packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV1ToV2/upgradeV1ToV2.ts

@@ -1,17 +1,16 @@
-import type { ActionType, ActionTypeV2 } from "@cursorless/common";
-import type { CommandV2 } from "@cursorless/common";
 import type {
+  ActionType,
+  ActionTypeV2,
+  CommandV1,
+  CommandV2,
+  ModifierV0V1,
   ModifierV2,
   PartialPrimitiveTargetDescriptorV2,
+  PartialPrimitiveTargetV0V1,
   PartialRangeTargetDescriptorV2,
   PartialTargetDescriptorV2,
-  SimpleScopeTypeTypeV2,
-} from "@cursorless/common";
-import type {
-  CommandV1,
-  ModifierV0V1,
-  PartialPrimitiveTargetV0V1,
   PartialTargetV0V1,
+  SimpleScopeTypeTypeV2,
 } from "@cursorless/common";
 import { upgradeStrictHere } from "./upgradeStrictHere";
 

packages/cursorless-engine/src/core/commandVersionUpgrades/upgradeV5ToV6/upgradeV5ToV6.ts

@@ -5,6 +5,8 @@ import type {
   CommandV6,
   DestinationDescriptor,
   EnforceUndefined,
+  ExecuteCommandOptions,
+  GetTextActionOptions,
   HighlightActionDescriptor,
   HighlightId,
   ImplicitDestinationDescriptor,
@@ -27,10 +29,6 @@ import type {
   ReplaceWith,
   WrapWithSnippetArg,
 } from "@cursorless/common";
-import {
-  type ExecuteCommandOptions,
-  type GetTextActionOptions,
-} from "@cursorless/common";
 import canonicalizeActionName from "./canonicalizeActionName";
 
 export function upgradeV5ToV6(command: CommandV5): EnforceUndefined<CommandV6> {

packages/cursorless-engine/src/cursorlessEngine.ts

@@ -3,14 +3,12 @@ import type {
   CommandServerApi,
   Hats,
   IDE,
+  RawTreeSitterQueryProvider,
   ScopeProvider,
+  TalonSpokenForms,
+  TreeSitter,
 } from "@cursorless/common";
-import {
-  ensureCommandShape,
-  type RawTreeSitterQueryProvider,
-  type TalonSpokenForms,
-  type TreeSitter,
-} from "@cursorless/common";
+import { ensureCommandShape } from "@cursorless/common";
 import { KeyboardTargetUpdater } from "./KeyboardTargetUpdater";
 import type {
   CommandRunnerDecorator,

packages/cursorless-engine/src/customCommandGrammar/grammarUtil.ts

@@ -1,28 +1,26 @@
 import type {
   BringMoveActionDescriptor,
+  ContainingScopeModifier,
   DestinationDescriptor,
   Direction,
   InsertionMode,
+  Modifier,
   PartialListTargetDescriptor,
+  PartialMark,
+  PartialPrimitiveTargetDescriptor,
   PartialRangeTargetDescriptor,
+  PartialTargetDescriptor,
   PartialTargetMark,
   PrimitiveDestinationDescriptor,
   RelativeScopeModifier,
-} from "@cursorless/common";
-import {
-  type ContainingScopeModifier,
-  type Modifier,
-  type PartialMark,
-  type PartialPrimitiveTargetDescriptor,
-  type PartialTargetDescriptor,
-  type ScopeType,
-  type SimpleActionDescriptor,
-  type SimpleActionName,
-  type SimplePartialMark,
-  type SimpleScopeType,
-  type SimpleScopeTypeType,
-  type SurroundingPairName,
-  type SurroundingPairScopeType,
+  ScopeType,
+  SimpleActionDescriptor,
+  SimpleActionName,
+  SimplePartialMark,
+  SimpleScopeType,
+  SimpleScopeTypeType,
+  SurroundingPairName,
+  SurroundingPairScopeType,
 } from "@cursorless/common";
 import type { WithPlaceholders } from "./WithPlaceholders";
 

packages/cursorless-engine/src/customCommandGrammar/parseCommand.ts

@@ -1,5 +1,4 @@
-import type { ScopeType } from "@cursorless/common";
-import { type ActionDescriptor } from "@cursorless/common";
+import type { ActionDescriptor, ScopeType } from "@cursorless/common";
 import { Grammar, Parser } from "nearley";
 import type { WithPlaceholders } from "./WithPlaceholders";
 import grammar from "./generated/grammar";

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

@@ -4,11 +4,11 @@ import type {
   Disposable,
   Listener,
   ScopeType,
+  TalonSpokenForms,
 } from "@cursorless/common";
-import { SpokenFormGenerator } from "./generateSpokenForm";
 import type { CustomSpokenFormGenerator } from "../api/CursorlessEngineApi";
 import { CustomSpokenForms } from "../spokenForms/CustomSpokenForms";
-import type { TalonSpokenForms } from "@cursorless/common";
+import { SpokenFormGenerator } from "./generateSpokenForm";
 
 /**
  * Simple facade that combines the {@link CustomSpokenForms} and

packages/cursorless-engine/src/languages/LanguageDefinition.ts

@@ -1,16 +1,13 @@
 import type {
+  IDE,
   RawTreeSitterQueryProvider,
   ScopeType,
   SimpleScopeType,
   SimpleScopeTypeType,
+  TextDocument,
   TreeSitter,
 } from "@cursorless/common";
-import {
-  matchAll,
-  showError,
-  type IDE,
-  type TextDocument,
-} from "@cursorless/common";
+import { matchAll, showError } from "@cursorless/common";
 import { TreeSitterScopeHandler } from "../processTargets/modifiers/scopeHandlers";
 import { TreeSitterQuery } from "./TreeSitterQuery";
 import type { QueryCapture } from "./TreeSitterQuery/QueryCapture";

packages/cursorless-engine/src/languages/LanguageDefinitions.ts

@@ -1,12 +1,11 @@
-import type { Disposable } from "@cursorless/common";
-import {
-  Notifier,
-  showError,
-  type IDE,
-  type Listener,
-  type RawTreeSitterQueryProvider,
-  type TreeSitter,
+import type {
+  Disposable,
+  IDE,
+  Listener,
+  RawTreeSitterQueryProvider,
+  TreeSitter,
 } from "@cursorless/common";
+import { Notifier, showError } from "@cursorless/common";
 import { toString } from "lodash-es";
 import { LanguageDefinition } from "./LanguageDefinition";
 import { treeSitterQueryCache } from "./TreeSitterQuery/treeSitterQueryCache";

packages/cursorless-engine/src/languages/TreeSitterQuery/TreeSitterQuery.ts

@@ -1,18 +1,17 @@
-import type { Position, TextDocument } from "@cursorless/common";
-import { type TreeSitter } from "@cursorless/common";
+import type { Position, TextDocument, TreeSitter } from "@cursorless/common";
 import type * as treeSitter from "web-tree-sitter";
 import { ide } from "../../singletons/ide.singleton";
+import { checkCaptureStartEnd } from "./checkCaptureStartEnd";
 import { getNodeRange } from "./getNodeRange";
+import { isContainedInErrorNode } from "./isContainedInErrorNode";
+import { normalizeCaptureName } from "./normalizeCaptureName";
+import { parsePredicatesWithErrorHandling } from "./parsePredicatesWithErrorHandling";
+import { positionToPoint } from "./positionToPoint";
 import type {
   MutableQueryCapture,
   MutableQueryMatch,
   QueryMatch,
 } from "./QueryCapture";
-import { checkCaptureStartEnd } from "./checkCaptureStartEnd";
-import { isContainedInErrorNode } from "./isContainedInErrorNode";
-import { normalizeCaptureName } from "./normalizeCaptureName";
-import { parsePredicatesWithErrorHandling } from "./parsePredicatesWithErrorHandling";
-import { positionToPoint } from "./positionToPoint";
 import {
   getStartOfEndOfRange,
   rewriteStartOfEndOf,

packages/cursorless-engine/src/processTargets/marks/LineNumberStage.ts

@@ -1,5 +1,8 @@
-import type { LineNumberMark, LineNumberType } from "@cursorless/common";
-import type { TextEditor } from "@cursorless/common";
+import type {
+  LineNumberMark,
+  LineNumberType,
+  TextEditor,
+} from "@cursorless/common";
 import { ide } from "../../singletons/ide.singleton";
 import type { MarkStage } from "../PipelineStages.types";
 import { createLineTarget } from "../modifiers/scopeHandlers";

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/DocumentScopeHandler.ts

@@ -1,5 +1,9 @@
-import type { TextEditor, Position } from "@cursorless/common";
-import type { Direction, ScopeType } from "@cursorless/common";
+import type {
+  Direction,
+  Position,
+  ScopeType,
+  TextEditor,
+} from "@cursorless/common";
 import { DocumentTarget } from "../../targets";
 import { BaseScopeHandler } from "./BaseScopeHandler";
 import type { TargetScope } from "./scope.types";

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NestedScopeHandler.ts

@@ -1,5 +1,9 @@
-import type { Direction, ScopeType } from "@cursorless/common";
-import type { Position, TextEditor } from "@cursorless/common";
+import type {
+  Direction,
+  Position,
+  ScopeType,
+  TextEditor,
+} from "@cursorless/common";
 import { flatmap } from "itertools";
 import { BaseScopeHandler } from "./BaseScopeHandler";
 import type { ScopeHandlerFactory } from "./ScopeHandlerFactory";

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/ParagraphScopeHandler.ts

@@ -1,11 +1,12 @@
 import type {
+  Direction,
   Position,
   Range,
+  ScopeType,
   TextDocument,
   TextEditor,
   TextLine,
 } from "@cursorless/common";
-import type { Direction, ScopeType } from "@cursorless/common";
 import { ParagraphTarget } from "../../targets";
 import { BaseScopeHandler } from "./BaseScopeHandler";
 import { fitRangeToLineContent } from "./LineScopeHandler";

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/InteriorScopeHandler.ts

@@ -1,25 +1,24 @@
-import {
-  NoContainingScopeError,
-  Range,
-  type Direction,
-  type InteriorScopeType,
-  type Position,
-  type ScopeType,
-  type TextEditor,
+import type {
+  Direction,
+  InteriorScopeType,
+  Position,
+  ScopeType,
+  TextEditor,
 } from "@cursorless/common";
+import { NoContainingScopeError, Range } from "@cursorless/common";
 import type { LanguageDefinitions } from "../../../../languages/LanguageDefinitions";
 import type { Target } from "../../../../typings/target.types";
 import { InteriorTarget } from "../../../targets";
 import { BaseScopeHandler } from "../BaseScopeHandler";
 import { FallbackScopeHandler } from "../FallbackScopeHandler";
-import { SortedScopeHandler } from "../SortedScopeHandler";
 import type { TargetScope } from "../scope.types";
 import type {
   ComplexScopeType,
+  ScopeHandler,
   ScopeIteratorRequirements,
 } from "../scopeHandler.types";
-import { type ScopeHandler } from "../scopeHandler.types";
 import type { ScopeHandlerFactory } from "../ScopeHandlerFactory";
+import { SortedScopeHandler } from "../SortedScopeHandler";
 
 export class InteriorScopeHandler extends BaseScopeHandler {
   protected isHierarchical = true;

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/SurroundingPairInteriorScopeHandler.ts

@@ -1,9 +1,15 @@
-import type { Direction, Position, TextEditor } from "@cursorless/common";
-import { type SurroundingPairInteriorScopeType } from "@cursorless/common";
+import type {
+  Direction,
+  Position,
+  SurroundingPairInteriorScopeType,
+  TextEditor,
+} from "@cursorless/common";
 import { BaseScopeHandler } from "../BaseScopeHandler";
 import type { TargetScope } from "../scope.types";
-import type { ScopeIteratorRequirements } from "../scopeHandler.types";
-import { type ScopeHandler } from "../scopeHandler.types";
+import type {
+  ScopeHandler,
+  ScopeIteratorRequirements,
+} from "../scopeHandler.types";
 import type { ScopeHandlerFactory } from "../ScopeHandlerFactory";
 
 export class SurroundingPairInteriorScopeHandler extends BaseScopeHandler {

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/getIndividualDelimiters.ts

@@ -1,9 +1,9 @@
-import type { SimpleSurroundingPairName } from "@cursorless/common";
-import {
-  isString,
-  type ComplexSurroundingPairName,
-  type SurroundingPairName,
+import type {
+  ComplexSurroundingPairName,
+  SimpleSurroundingPairName,
+  SurroundingPairName,
 } from "@cursorless/common";
+import { isString } from "@cursorless/common";
 import { concat, uniq } from "lodash-es";
 import { complexDelimiterMap, getSimpleDelimiterMap } from "./delimiterMaps";
 import type { IndividualDelimiter } from "./types";

packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/types.ts

@@ -1,5 +1,4 @@
-import type { SimpleSurroundingPairName } from "@cursorless/common";
-import { type Range } from "@cursorless/common";
+import type { Range, SimpleSurroundingPairName } from "@cursorless/common";
 
 /**
  * Used to indicate whether a particular side of the delimiter is left or right