Merge pull request #278 from BalticAmadeus/276-conditional-using-stat…

…ements-should-not-be-sorted 276 change sorting of using statements
BalticAmadeus · Dec 10, 2024 · b8dd75c · b8dd75c
2 parents 9a5b4a6 + 492309f
commit b8dd75c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/resources/functionalTests/using/3lowercase/input.p b/resources/functionalTests/using/3lowercase/input.p
@@ -3,7 +3,7 @@
       "abl.completion.upperCase": false}*/
 
 using as.
-define variable a as integer no-undo.
+//define variable a as integer no-undo.
 USING b.
 using c.
 USING a.
diff --git a/resources/functionalTests/using/3lowercase/target.p b/resources/functionalTests/using/3lowercase/target.p
@@ -3,7 +3,7 @@
       "abl.completion.upperCase": false}*/
 
 using a.
-define variable a as integer no-undo.
+//define variable a as integer no-undo.
 using as.
 using b.
 using c.
diff --git a/resources/functionalTests/using/4optional-statements/input.p b/resources/functionalTests/using/4optional-statements/input.p
@@ -3,8 +3,8 @@
       "abl.completion.upperCase": false}*/
 
 using A from propath.
-define variable c as integer no-undo.
+//define variable c as integer no-undo.
 USING b.
 using c FROM aSsemblY.
-message ".".
+//message ".".
 USING a.
diff --git a/resources/functionalTests/using/4optional-statements/target.p b/resources/functionalTests/using/4optional-statements/target.p
@@ -3,8 +3,8 @@
       "abl.completion.upperCase": false}*/
 
 using A from propath.
-define variable c as integer no-undo.
+//define variable c as integer no-undo.
 using a.
 using b.
-message ".".
+//message ".".
 using c from assembly.
diff --git a/src/v2/formatters/using/UsingFormatter.ts b/src/v2/formatters/using/UsingFormatter.ts
@@ -16,15 +16,14 @@ export class UsingFormatter extends AFormatter implements IFormatter {
 
     private usingStatementsFound: number = 0;
     private alignOptionalStatements: number = 0;
+    private usingStatements: UsingStatement[] = [];
+    private textUsingStatements: string[] = [];
 
     public constructor(configurationManager: IConfigurationManager) {
         super(configurationManager);
         this.settings = new UsingSettings(configurationManager);
     }
 
-    private usingStatements: UsingStatement[] = [];
-    private textUsingStatements: string[] = [];
-
     match(node: Readonly<SyntaxNode>): boolean {
         if (node.type === SyntaxNodeType.UsingStatement) {
             return true;
@@ -44,10 +43,13 @@ export class UsingFormatter extends AFormatter implements IFormatter {
             this.textUsingStatements.sort();
         }
         const text = FormatterHelper.getCurrentText(node, fullText);
-        if (this.usingStatementsFound > this.usingStatements.length) {
+        if (this.usingStatementsFound > this.textUsingStatements.length) {
             return undefined;
         }
         const newText = this.textUsingStatements[this.usingStatementsFound - 1];
+        if (this.usingStatementsFound === this.textUsingStatements.length) {
+            this.reset();
+        }
         return this.getCodeEdit(node, text, newText, fullText);
     }
 
@@ -56,9 +58,12 @@ export class UsingFormatter extends AFormatter implements IFormatter {
         fullText: FullText
     ): void {
         for (node; node !== null; node = node.nextSibling) {
-            if (!this.match(node)) {
+            if (node.type === SyntaxNodeType.Comment) {
                 continue;
             }
+            if (!this.match(node)) {
+                break;
+            }
 
             const keywordChild = node.child(0);
             const identifierChild = node.child(1);
@@ -126,6 +131,13 @@ export class UsingFormatter extends AFormatter implements IFormatter {
             );
         }
     }
+
+    private reset(): void {
+        this.usingStatementsFound = 0;
+        this.alignOptionalStatements = 0;
+        this.usingStatements = [];
+        this.textUsingStatements = [];
+    }
 }
 
 type UsingStatement = {