Merge pull request #135 from MehediDracula/claude/perf-diagnostics-on-save-4sKT7

Run diagnostics on save instead of every keystroke

Author: MehediDracula

src/core/PhpClassDetector.ts

@@ -375,8 +375,8 @@ export class PhpClassDetector {
             let trimmed = part.trim();
             if (!trimmed) { continue; }
 
-            // Strip PHP 8 attributes (e.g. #[CurrentUser])
-            trimmed = trimmed.replace(/#\[[^\]]*\]\s*/g, '');
+            // Strip PHP 8 attributes (e.g. #[CurrentUser], #[MapQueryString(validationGroups: ["strict"])])
+            trimmed = trimmed.replace(/#\[(?:[^\[\]]|\[(?:[^\[\]]|\[[^\[\]]*\])*\])*\]\s*/g, '');
 
             // Strip constructor promotion modifiers
             trimmed = trimmed.replace(/^(?:public|protected|private)\s+/, '');
@@ -401,13 +401,14 @@ function matchAll(text: string, regex: RegExp): string[] {
     return results;
 }
 
+const SCALAR_TYPES = new Set([
+    'String', 'Int', 'Float', 'Bool', 'Array', 'Object',
+    'Null', 'Void', 'Never', 'Mixed', 'Self', 'Static', 'Parent',
+    'True', 'False', 'Iterable', 'Callable',
+]);
+
 function isScalarType(name: string): boolean {
-    const scalars = new Set([
-        'String', 'Int', 'Float', 'Bool', 'Array', 'Object',
-        'Null', 'Void', 'Never', 'Mixed', 'Self', 'Static', 'Parent',
-        'True', 'False', 'Iterable', 'Callable',
-    ]);
-    return scalars.has(name);
+    return SCALAR_TYPES.has(name);
 }
 
 function escapeRegex(str: string): string {

src/extension.ts

@@ -95,49 +95,42 @@ export function activate(context: vscode.ExtensionContext): void {
             const needsSort = getConfig('sortOnSave');
             if (!needsRemove && !needsSort) { return; }
 
-            diagnosticManager.suppressUpdates = true;
-
             event.waitUntil(((): Promise<vscode.TextEdit[]> => {
-                try {
-                    const document = event.document;
-                    const { useStatements } = parser.parse(document);
-                    if (useStatements.length === 0) { return Promise.resolve([]); }
-
-                    let stmtsToKeep = useStatements;
-
-                    // Filter out unused class imports
-                    if (needsRemove) {
-                        const text = document.getText();
-                        const detectedClasses = detector.detectAll(text);
-                        const ignoreList = getConfig('ignoreList');
-                        stmtsToKeep = useStatements.filter(stmt => {
-                            if (stmt.kind !== 'class') { return true; }
-                            if (ignoreList.includes(stmt.className)) { return true; }
-                            if (detectedClasses.includes(stmt.className)) { return true; }
-                            if (text.includes(`${stmt.className}\\`)) { return true; }
-                            return false;
-                        });
-                    }
-
-                    // Sort remaining imports (or just sort without remove)
-                    if (needsSort && stmtsToKeep.length > 1) {
-                        return Promise.resolve(sortManager.computeSortEdits(document, stmtsToKeep));
-                    }
-
-                    // Remove-only: delete unused lines (reverse order for stable line numbers)
-                    if (needsRemove && stmtsToKeep.length < useStatements.length) {
-                        const removed = useStatements.filter(s => !stmtsToKeep.includes(s));
-                        const edits = removed
-                            .sort((a, b) => b.line - a.line)
-                            .map(stmt => vscode.TextEdit.delete(document.lineAt(stmt.line).rangeIncludingLineBreak));
-                        return Promise.resolve(edits);
-                    }
-
-                    return Promise.resolve([]);
-                } finally {
-                    // Defer re-enabling so diagnostics don't fire during the save edit application
-                    setTimeout(() => { diagnosticManager.suppressUpdates = false; }, 100);
+                const document = event.document;
+                const { useStatements } = parser.parse(document);
+                if (useStatements.length === 0) { return Promise.resolve([]); }
+
+                let stmtsToKeep = useStatements;
+
+                // Filter out unused class imports
+                if (needsRemove) {
+                    const text = document.getText();
+                    const detectedClasses = detector.detectAll(text);
+                    const ignoreList = getConfig('ignoreList');
+                    stmtsToKeep = useStatements.filter(stmt => {
+                        if (stmt.kind !== 'class') { return true; }
+                        if (ignoreList.includes(stmt.className)) { return true; }
+                        if (detectedClasses.includes(stmt.className)) { return true; }
+                        if (text.includes(`${stmt.className}\\`)) { return true; }
+                        return false;
+                    });
+                }
+
+                // Sort remaining imports (or just sort without remove)
+                if (needsSort && stmtsToKeep.length > 1) {
+                    return Promise.resolve(sortManager.computeSortEdits(document, stmtsToKeep));
                 }
+
+                // Remove-only: delete unused lines (reverse order for stable line numbers)
+                if (needsRemove && stmtsToKeep.length < useStatements.length) {
+                    const removed = useStatements.filter(s => !stmtsToKeep.includes(s));
+                    const edits = removed
+                        .sort((a, b) => b.line - a.line)
+                        .map(stmt => vscode.TextEdit.delete(document.lineAt(stmt.line).rangeIncludingLineBreak));
+                    return Promise.resolve(edits);
+                }
+
+                return Promise.resolve([]);
             })());
         })
     );

src/features/DiagnosticManager.ts

@@ -11,13 +11,8 @@ const DIAGNOSTIC_SOURCE = 'PHP Namespace Resolver';
 export class DiagnosticManager implements vscode.Disposable {
     private collection: vscode.DiagnosticCollection;
     private disposables: vscode.Disposable[] = [];
-    private debounceTimer: ReturnType<typeof setTimeout> | undefined;
-    private _suppressUpdates = false;
     private lastVersion = new Map<string, number>();
 
-    /** Suppress diagnostic updates during programmatic edits (e.g. save operations). */
-    set suppressUpdates(value: boolean) { this._suppressUpdates = value; }
-
     constructor(
         private detector: PhpClassDetector,
         private parser: DeclarationParser,
@@ -27,16 +22,9 @@ export class DiagnosticManager implements vscode.Disposable {
 
         this.disposables.push(
             cache.onDidFinishIndexing(() => this.refreshVisible()),
-            vscode.window.onDidChangeActiveTextEditor(editor => {
-                if (!editor || editor.document.languageId !== 'php') { return; }
-                this.update(editor.document);
-            }),
-            vscode.workspace.onDidChangeTextDocument(event => {
-                if (event.document.languageId !== 'php') { return; }
-                if (this._suppressUpdates) { return; }
-                clearTimeout(this.debounceTimer);
-                const doc = event.document;
-                this.debounceTimer = setTimeout(() => this.update(doc), 800);
+            vscode.workspace.onDidSaveTextDocument(document => {
+                if (document.languageId !== 'php') { return; }
+                this.update(document);
             }),
             vscode.workspace.onDidCloseTextDocument(document => {
                 this.clear(document.uri);
@@ -101,7 +89,6 @@ export class DiagnosticManager implements vscode.Disposable {
     }
 
     dispose(): void {
-        clearTimeout(this.debounceTimer);
         this.disposables.forEach(d => d.dispose());
         this.collection.dispose();
     }