Fix method spacing and add Red Hat Java formatter integration (#9)

* Initial plan

* Fix blank lines between methods and add Red Hat Java formatting

Co-authored-by: unknowIfGuestInDream <57802425+unknowIfGuestInDream@users.noreply.github.com>

* Address code review feedback: fix comment and remove console.log

Co-authored-by: unknowIfGuestInDream <57802425+unknowIfGuestInDream@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: unknowIfGuestInDream <57802425+unknowIfGuestInDream@users.noreply.github.com>

Author: Copilot

src/extension.ts

@@ -2,6 +2,9 @@ import * as vscode from 'vscode';
 import { JavaMethodSorter } from './sorter/javaMethodSorter';
 import { SortingOptions } from './sorter/types';
 
+// Extension ID for Red Hat Java Language Support
+const REDHAT_JAVA_EXTENSION_ID = 'redhat.java';
+
 /**
  * Get sorting options from VS Code configuration
  */
@@ -19,6 +22,30 @@ function getSortingOptions(): SortingOptions {
     };
 }
 
+/**
+ * Check if the Red Hat Java extension is installed
+ */
+function isRedHatJavaExtensionAvailable(): boolean {
+    const extension = vscode.extensions.getExtension(REDHAT_JAVA_EXTENSION_ID);
+    return extension !== undefined;
+}
+
+/**
+ * Format the document using Red Hat Java extension if available
+ */
+async function formatDocumentWithRedHatJava(): Promise<void> {
+    if (!isRedHatJavaExtensionAvailable()) {
+        return;
+    }
+
+    try {
+        // Execute the format document command
+        await vscode.commands.executeCommand('editor.action.formatDocument');
+    } catch {
+        // Silently ignore formatting errors - the sorting is complete
+    }
+}
+
 /**
  * Sort methods in the active Java editor
  */
@@ -54,6 +81,10 @@ async function sortMethods(): Promise<void> {
         );
         edit.replace(document.uri, fullRange, sortedText);
         await vscode.workspace.applyEdit(edit);
+
+        // Format document with Red Hat Java extension if available
+        await formatDocumentWithRedHatJava();
+
         vscode.window.showInformationMessage('Methods sorted successfully');
     } catch (error) {
         const message = error instanceof Error ? error.message : 'Failed to sort methods';
@@ -95,6 +126,10 @@ async function shuffleMethodsRandomly(): Promise<void> {
         );
         edit.replace(document.uri, fullRange, shuffledText);
         await vscode.workspace.applyEdit(edit);
+
+        // Format document with Red Hat Java extension if available
+        await formatDocumentWithRedHatJava();
+
         vscode.window.showInformationMessage('Methods shuffled randomly');
     } catch (error) {
         const message = error instanceof Error ? error.message : 'Failed to shuffle methods';

src/sorter/javaMethodSorter.ts

@@ -299,9 +299,9 @@ export class JavaMethodSorter {
             return normalizedFullText;
         });
 
-        // Remove trailing whitespace from preContent to avoid duplicate indentation
-        // since leadingContent already includes the proper indentation
-        const normalizedPreContent = preContent.replace(/[ \t]+$/, '');
+        // Normalize preContent: remove trailing whitespace and excess newlines
+        // Add consistent single blank line before first method
+        const normalizedPreContent = preContent.replace(/\s+$/, '') + '\n\n';
 
         return normalizedPreContent + methodTexts.join('\n\n') + postContent;
     }

src/test/sorter.test.ts

@@ -425,6 +425,51 @@ public class MyClass {
         failed++;
     }
 
+    // Test 13: Multiple blank lines in source are normalized to single blank line
+    try {
+        const source = `public class MyClass {
+
+
+    // Comment with 2 blank lines before it
+    private void methodA() {
+        System.out.println("A");
+    }
+
+
+
+    // Comment with 3 blank lines before it
+    public void methodB() {
+        System.out.println("B");
+    }
+}`;
+        const options: SortingOptions = {
+            sortingStrategy: 'depth-first',
+            applyWorkingListHeuristics: false,
+            respectBeforeAfterRelation: false,
+            clusterOverloadedMethods: false,
+            clusterGetterSetter: false,
+            separateByAccessLevel: true,
+            separateConstructors: false,
+            applyLexicalOrdering: false
+        };
+        const sorter = new JavaMethodSorter(options);
+        const sorted = sorter.sort(source);
+        
+        // Should not have more than 2 consecutive newlines (1 blank line)
+        const hasMultipleBlankLines = /\n{3,}/.test(sorted);
+        if (!hasMultipleBlankLines) {
+            console.log('✓ Test 13 passed: Multiple blank lines in source are normalized');
+            passed++;
+        } else {
+            console.log('✗ Test 13 failed: Found multiple blank lines in output');
+            console.log('Sorted output:', sorted);
+            failed++;
+        }
+    } catch (e) {
+        console.log('✗ Test 13 failed with error:', e);
+        failed++;
+    }
+    
     console.log(`\nResults: ${passed} passed, ${failed} failed`);
 }