NEW (Extension) @W-17865130@ Fix indentation for paranthesis and square brackets (#181)

Author: jag-j

src/extension.ts

@@ -28,7 +28,7 @@ import * as DeltaRunFunctions from './deltarun/delta-run-service';
 import * as os from 'os';
 import * as fs from 'fs';
 import { ApexPmdViolationsFixer } from './modelBasedFixers/apex-pmd-violations-fixer'
-import { VSCodeUnifiedDiff, DiffHunk } from './shared/UnifiedDiff';
+import { VSCodeUnifiedDiff, DiffHunk, CODEGENIE_UNIFIED_DIFF_ACCEPT, CODEGENIE_UNIFIED_DIFF_REJECT, CODEGENIE_UNIFIED_DIFF_ACCEPT_ALL, CODEGENIE_UNIFIED_DIFF_REJECT_ALL } from './shared/UnifiedDiff';
 
 export type RunInfo = {
 	diagnosticCollection?: vscode.DiagnosticCollection;
@@ -238,18 +238,18 @@ function setupUnifiedDiff(context: vscode.ExtensionContext, diagnosticManager: D
 			})
 	);
 	context.subscriptions.push(
-			vscode.commands.registerCommand(Constants.UNIFIED_DIFF_ACCEPT, async (hunk: DiffHunk, range: vscode.Range) => {
+			vscode.commands.registerCommand(CODEGENIE_UNIFIED_DIFF_ACCEPT, async (hunk: DiffHunk, range: vscode.Range) => {
 				await VSCodeUnifiedDiff.singleton.unifiedDiffAccept(hunk);
 				apexPmdFixer.removeDiagnosticsWithInRange(vscode.window.activeTextEditor.document.uri, range, diagnosticCollection);
 			})
 	);
 	context.subscriptions.push(
-			vscode.commands.registerCommand(Constants.UNIFIED_DIFF_REJECT, async (hunk: DiffHunk) => {
+			vscode.commands.registerCommand(CODEGENIE_UNIFIED_DIFF_REJECT, async (hunk: DiffHunk) => {
 				await VSCodeUnifiedDiff.singleton.unifiedDiffReject(hunk);
 			})
 	);
 	context.subscriptions.push(
-			vscode.commands.registerCommand(Constants.UNIFIED_DIFF_ACCEPT_ALL, async () => {
+			vscode.commands.registerCommand(CODEGENIE_UNIFIED_DIFF_ACCEPT_ALL, async () => {
 				await VSCodeUnifiedDiff.singleton.unifiedDiffAcceptAll();
 				// For accept all, it is tricky to get all the code that gets accepted and to remove them from diagnostic.
 				// Hence, we save the file and rerun the scan instead.
@@ -262,7 +262,7 @@ function setupUnifiedDiff(context: vscode.ExtensionContext, diagnosticManager: D
 			})
 	);
 	context.subscriptions.push(
-			vscode.commands.registerCommand(Constants.UNIFIED_DIFF_REJECT_ALL, async () => {
+			vscode.commands.registerCommand(CODEGENIE_UNIFIED_DIFF_REJECT_ALL, async () => {
 				await VSCodeUnifiedDiff.singleton.unifiedDiffRejectAll();
 			})
 	);

src/lib/constants.ts

@@ -46,7 +46,3 @@ export const APEX_GURU_RETRY_INTERVAL_MILLIS = 1000;
 export const ENABLE_A4D_INTEGRATION = false;
 export const A4D_FIX_AVAILABLE_RULES = ['ApexCRUDViolation', 'ApexSharingViolations', 'EmptyCatchBlock', 'EmptyTryOrFinallyBlock', 'EmptyWhileStmt', 'EmptyIfStmt'];
 export const UNIFIED_DIFF = 'unifiedDiff';
-export const UNIFIED_DIFF_ACCEPT = 'unifiedDiff.accept';
-export const UNIFIED_DIFF_REJECT = 'unifiedDiff.reject';
-export const UNIFIED_DIFF_ACCEPT_ALL = 'unifiedDiff.acceptAll';
-export const UNIFIED_DIFF_REJECT_ALL = 'unifiedDiff.rejectAll';

src/modelBasedFixers/apex-pmd-violations-fixer.ts

@@ -211,22 +211,42 @@ export class ApexPmdViolationsFixer implements vscode.CodeActionProvider {
         const normalizedLines = lines.map(line => line.trimStart());
 
         let indentLevel = 0;
+        let braceLevel = 0;
+        let parenLevel = 0;
+        let bracketLevel = 0;
 
         // Process each line to match the document's indentation style
         const formattedLines = normalizedLines.map((line) => {
             if (line.trim() === '') {
                 // Preserve empty lines without indentation
                 return '';
             }
+            indentLevel = braceLevel + parenLevel + bracketLevel;
+
             if (line.startsWith('}')) {
+                braceLevel = Math.max(0, braceLevel - 1);
+                indentLevel = Math.max(0, indentLevel - 1);
+            }
+
+            if (line.startsWith(')')) {
+                parenLevel = Math.max(0, parenLevel - 1);
+                indentLevel = Math.max(0, indentLevel - 1);
+            }
+
+            if (line.startsWith(']')) {
+                bracketLevel = Math.max(0, bracketLevel - 1);
                 indentLevel = Math.max(0, indentLevel - 1);
             }
 
             const indentation = baseIndentation + '    '.repeat(indentLevel);
 
             // Adjust for next lines, this line needs no changes
             if (line.endsWith('{')) {
-                indentLevel++;
+                braceLevel++;
+            } else if (line.endsWith('(')) {
+                parenLevel++;
+            } else if (line.endsWith('[')) {
+                braceLevel++;
             }
 
             return indentation + line;

src/test/suite/modelBasedFixers/apex-pmd-violations-fixer.test.ts

@@ -144,6 +144,26 @@ suite('apex-pmd-violations-fixer.ts', () => {
             expect(result).to.equal('class Test {\n    void method() {\n        int x = 1;\n        x++;\n        x=10;\n    }\n}');
         });
 
+        test('should replace code while preserving indentation for multiple lines for brackets', () => {
+            const fileContent = 'class Test {\n    String soql =  [\n        // soql\n    ]\n}';
+            const replaceCode = 'SELECT ID\nFROM\nACCOUNT';
+            (fakeDocument.lineAt as Sinon.SinonStub).callsFake((line: number) => ({
+                text: fileContent.split("\n")[line]
+            }));
+            const result = fixer.replaceCodeInFile(fileContent, replaceCode, 3, 3, fakeDocument);
+            expect(result).to.equal('class Test {\n    String soql =  [\n        SELECT ID\n        FROM\n        ACCOUNT\n    ]\n}');
+        });
+
+        test('should replace code while preserving indentation for multiple lines for paranthesis', () => {
+            const fileContent = 'class Test {\n    String soql =  (\n        // soql\n    )\n}';
+            const replaceCode = 'SELECT ID\nFROM\nACCOUNT';
+            (fakeDocument.lineAt as Sinon.SinonStub).callsFake((line: number) => ({
+                text: fileContent.split("\n")[line]
+            }));
+            const result = fixer.replaceCodeInFile(fileContent, replaceCode, 3, 3, fakeDocument);
+            expect(result).to.equal('class Test {\n    String soql =  (\n        SELECT ID\n        FROM\n        ACCOUNT\n    )\n}');
+        });
+
         test('should replace code for windows', () => {
             const fileContent = 'class Test {\r\n    void method() {\r\n        // code\r\n    }\r\n}';
             const replaceCode = 'int x = 1;';