merge: integrate refactor/consolidate-commands-and-cleanup into develop

Resolves conflicts:
- .gitignore: combine develop's comprehensive entries with *.patch
- extension.ts: take refactored CommandsHandler structure, port
  isModuleImport hotfix into simplified hover provider

Author: vukefn

.gitignore

@@ -39,3 +39,6 @@ Thumbs.db
 .claude
 .codex
 .gemini
+
+# Patch files
+*.patch

src/commands/CommandsHandler.ts

@@ -1 +1 @@
-export { CommandsHandler } from "./CommandsHandler";
+export { CommandsHandler, CommandsDependencies } from "./CommandsHandler";

src/commands/index.ts

@@ -3,13 +3,19 @@ import { logger } from "../utils";
 import { ImportFormatter } from "./ImportFormatter";
 import { ImportPathConverter } from "./ImportPathConverter";
 
+/** Tracks hover state for a document's imports. */
+interface HoverState {
+    lineNumber: number;
+    timeout: NodeJS.Timeout | null;
+}
+
 export class ImportCodeLensProvider implements vscode.CodeLensProvider {
-    private _onDidChangeCodeLenses: vscode.EventEmitter<void> = new vscode.EventEmitter<void>();
+    private readonly _onDidChangeCodeLenses = new vscode.EventEmitter<void>();
     public readonly onDidChangeCodeLenses: vscode.Event<void> = this._onDidChangeCodeLenses.event;
 
-    private importPathConverter: ImportPathConverter;
-    private hoverState = new Map<string, { lineNumber: number; timeout: NodeJS.Timeout | null }>();
-    private isHoveringImport = new Map<string, boolean>();
+    private readonly importPathConverter: ImportPathConverter;
+    private readonly hoverState = new Map<string, HoverState>();
+    private readonly isHoveringImport = new Map<string, boolean>();
     private refreshTimeout: NodeJS.Timeout | null = null;
 
     constructor(private outputChannel: vscode.OutputChannel) {

src/extension.ts

@@ -2,16 +2,64 @@ import * as vscode from "vscode";
 import { logger } from "../utils";
 import { ImportFormatter } from "./ImportFormatter";
 
+/** Represents a contiguous block of import statements in the document. */
+interface ImportBlock {
+    start: number;
+    end: number;
+    imports: string[];
+}
+
+/** Represents a single line edit for syntax conversion. */
+interface LineEdit {
+    line: number;
+    oldText: string;
+    newText: string;
+}
+
 /**
  * Handles all document modifications for imports.
  */
 export class ImportDocumentEditor {
-    private formatter: ImportFormatter;
+    private readonly formatter: ImportFormatter;
 
     constructor(private outputChannel: vscode.OutputChannel, formatter: ImportFormatter) {
         this.formatter = formatter;
     }
 
+    /**
+     * Creates an edit to replace an import block with combined and formatted imports.
+     */
+    private createBlockReplacementEdit(
+        edit: vscode.WorkspaceEdit,
+        document: vscode.TextDocument,
+        block: ImportBlock,
+        newPaths: string[],
+        preferDotSyntax: boolean,
+        sortAlphabetically: boolean
+    ): void {
+        // Get existing paths in this block for combined sorting
+        const existingBlockPaths = block.imports
+            .map((imp) => this.formatter.extractPathFromImport(imp))
+            .filter((p): p is string => p !== null);
+
+        const combinedPaths = [...existingBlockPaths, ...newPaths];
+        if (sortAlphabetically) {
+            combinedPaths.sort((a, b) => a.localeCompare(b));
+        }
+
+        // Format all imports for this block
+        const formattedImports = combinedPaths.map((path) =>
+            this.formatter.formatImportStatement(path, preferDotSyntax)
+        );
+
+        // Replace the entire block
+        edit.replace(
+            document.uri,
+            new vscode.Range(new vscode.Position(block.start, 0), new vscode.Position(block.end + 1, 0)),
+            formattedImports.join("\n") + "\n"
+        );
+    }
+
     /**
      * Extracts existing import statements from a document.
      */
@@ -55,8 +103,8 @@ export class ImportDocumentEditor {
         const lines = text.split("\n");
         const existingImports = new Set<string>();
 
-        const importBlocks: { start: number; end: number; imports: string[] }[] = [];
-        let currentBlock: { start: number; end: number; imports: string[] } | null = null;
+        const importBlocks: ImportBlock[] = [];
+        let currentBlock: ImportBlock | null = null;
 
         for (let i = 0; i < lines.length; i++) {
             const line = lines[i].trim();
@@ -153,38 +201,26 @@ export class ImportDocumentEditor {
 
                 // Add digest imports to digest block
                 if (newDigestPaths.length > 0 && digestBlockIndex >= 0) {
-                    const block = importBlocks[digestBlockIndex];
-                    // Get existing paths in this block for combined sorting
-                    const existingBlockPaths = block.imports.map((imp) => this.formatter.extractPathFromImport(imp)).filter((p) => p) as string[];
-
-                    const combinedPaths = [...existingBlockPaths, ...newDigestPaths];
-                    if (sortAlphabetically) {
-                        combinedPaths.sort((a, b) => a.localeCompare(b));
-                    }
-
-                    // Format all imports for this block
-                    const formattedImports = combinedPaths.map((path) => this.formatter.formatImportStatement(path, preferDotSyntax));
-
-                    // Replace the entire block
-                    edit.replace(document.uri, new vscode.Range(new vscode.Position(block.start, 0), new vscode.Position(block.end + 1, 0)), formattedImports.join("\n") + "\n");
+                    this.createBlockReplacementEdit(
+                        edit,
+                        document,
+                        importBlocks[digestBlockIndex],
+                        newDigestPaths,
+                        preferDotSyntax,
+                        sortAlphabetically
+                    );
                 }
 
                 // Add local imports to local block
                 if (newLocalPaths.length > 0 && localBlockIndex >= 0) {
-                    const block = importBlocks[localBlockIndex];
-                    // Get existing paths in this block for combined sorting
-                    const existingBlockPaths = block.imports.map((imp) => this.formatter.extractPathFromImport(imp)).filter((p) => p) as string[];
-
-                    const combinedPaths = [...existingBlockPaths, ...newLocalPaths];
-                    if (sortAlphabetically) {
-                        combinedPaths.sort((a, b) => a.localeCompare(b));
-                    }
-
-                    // Format all imports for this block
-                    const formattedImports = combinedPaths.map((path) => this.formatter.formatImportStatement(path, preferDotSyntax));
-
-                    // Replace the entire block
-                    edit.replace(document.uri, new vscode.Range(new vscode.Position(block.start, 0), new vscode.Position(block.end + 1, 0)), formattedImports.join("\n") + "\n");
+                    this.createBlockReplacementEdit(
+                        edit,
+                        document,
+                        importBlocks[localBlockIndex],
+                        newLocalPaths,
+                        preferDotSyntax,
+                        sortAlphabetically
+                    );
                 }
 
                 // Handle imports that don't have a matching block
@@ -453,7 +489,7 @@ export class ImportDocumentEditor {
 
         const text = document.getText();
         const lines = text.split("\n");
-        const edits: { line: number; oldText: string; newText: string }[] = [];
+        const edits: LineEdit[] = [];
 
         for (let i = 0; i < lines.length; i++) {
             const line = lines[i];