fixing broken formatting rules and tests

HaxeFoundation · Feb 6, 2024 · da2821f · da2821f
1 parent 589f03b
commit da2821f
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog
+## 1.4.36
+* Fixed: Restored broken formatting rules
+* Fixed: Prevent anonymous types from being formatted as code-blocks
+
 ## 1.4.35
 * Fixed: Assign hint was not working when resolving function return type.
 

diff --git a/src/main/java/com/intellij/plugins/haxe/ide/formatter/HaxeSpacingProcessor.java b/src/main/java/com/intellij/plugins/haxe/ide/formatter/HaxeSpacingProcessor.java
@@ -332,8 +332,10 @@ else if (typeType1 == OCOLON) {
     // Spacing around assignment operators (=, -=, etc.)
     //
 
-    if (ASSIGN_OPERATORS.contains(typeType1) || ASSIGN_OPERATORS.contains(typeType2) ||
-        type2 == VAR_INIT) {
+    if (ASSIGN_OPERATORS.contains(type1)
+        || ASSIGN_OPERATORS.contains(typeType1)
+        || ASSIGN_OPERATORS.contains(typeType2)
+        || type2 == VAR_INIT) {
       return addSingleSpaceIf(mySettings.SPACE_AROUND_ASSIGNMENT_OPERATORS);
     }
 

diff --git a/src/test/resources/testData/formatter/BracePlacement1.txt b/src/test/resources/testData/formatter/BracePlacement1.txt
@@ -4,8 +4,7 @@ class Foo
     function fOne(argA:Int, argB, argC, argD, argE, argF, argG, argH)
     {
         var numbers:Array< String> = ['one', 'two', 'three', 'four', 'five', 'six'];
-        var x = ("" + argA) + argB +
-        argC + argD + argE + argF + argG + argH;
+        var x = ("" + argA) + argB + argC + argD + argE + argF + argG + argH;
         try
             {
             this.fTwo(argA, argB, argC, this.fThree("", argE, argF, argG, argH));

diff --git a/src/test/resources/testData/formatter/BracePlacement2.txt b/src/test/resources/testData/formatter/BracePlacement2.txt
@@ -3,8 +3,7 @@ class Foo {
     function fOne(argA:Int, argB, argC, argD, argE, argF, argG, argH)
         {
         var numbers:Array< String> = ['one', 'two', 'three', 'four', 'five', 'six'];
-        var x = ("" + argA) + argB +
-        argC + argD + argE + argF + argG + argH;
+        var x = ("" + argA) + argB + argC + argD + argE + argF + argG + argH;
         try {
             this.fTwo(argA, argB, argC, this.fThree("", argE, argF, argG, argH));
         } catch (ignored:String) {

diff --git a/src/test/resources/testData/formatter/Default.txt b/src/test/resources/testData/formatter/Default.txt
@@ -42,7 +42,7 @@ class Foo {
     }
 
     public function new() {
-        switch( v ) {
+        switch (v) {
             case 0:
                 e1();
             case foo(1):

diff --git a/src/test/resources/testData/formatter/IndentSpaces.txt b/src/test/resources/testData/formatter/IndentSpaces.txt
@@ -42,7 +42,7 @@ class Foo {
    }
 
    public function new() {
-      switch( v ) {
+      switch (v) {
          case 0:
             e1();
          case foo(1):

diff --git a/src/test/resources/testData/formatter/IndentTabs.txt b/src/test/resources/testData/formatter/IndentTabs.txt
@@ -42,7 +42,7 @@ class Foo {
 	}
 
 	public function new() {
-		switch( v ) {
+		switch (v) {
 			case 0:
 				e1();
 			case foo(1):

diff --git a/src/test/resources/testData/formatter/SpaceAroundOperators.txt b/src/test/resources/testData/formatter/SpaceAroundOperators.txt
@@ -2,8 +2,7 @@ class Foo {
     // function fBar (x,y);
     function fOne(argA:Int, argB, argC, argD, argE, argF, argG, argH) {
         var numbers:Array< String>=['one', 'two', 'three', 'four', 'five', 'six'];
-        var x=("" + argA) + argB +
-        argC + argD + argE + argF + argG + argH;
+        var x=(""+argA)+argB+argC+argD+argE+argF+argG+argH;
         try {
             this.fTwo(argA, argB, argC, this.fThree("", argE, argF, argG, argH));
         } catch (ignored:String) {
@@ -22,15 +21,15 @@ class Foo {
     function fTwo(strA, strB, strC, strD) {
         if (true)
             return strC;
-        if (strA=='one' || strB=='two') {
-            return strA + strB;
+        if (strA=='one'||strB=='two') {
+            return strA+strB;
         } else if (true)
             return strD;
         throw strD;
     }
 
     function fThree(strA, strB, strC, strD, strE) {
-        return strA + strB + strC + strD + strE;
+        return strA+strB+strC+strD+strE;
     }
 
     public function new() {}

diff --git a/src/test/resources/testData/formatter/SpaceBeforeParentheses.txt b/src/test/resources/testData/formatter/SpaceBeforeParentheses.txt
@@ -2,8 +2,7 @@ class Foo {
     // function fBar (x,y);
     function fOne (argA:Int, argB, argC, argD, argE, argF, argG, argH) {
         var numbers:Array< String> = ['one', 'two', 'three', 'four', 'five', 'six'];
-        var x = ("" + argA) + argB +
-        argC + argD + argE + argF + argG + argH;
+        var x = ("" + argA) + argB + argC + argD + argE + argF + argG + argH;
         try {
             this.fTwo (argA, argB, argC, this.fThree ("", argE, argF, argG, argH));
         } catch(ignored:String) {

diff --git a/src/test/resources/testData/formatter/SpaceLeftBraces.txt b/src/test/resources/testData/formatter/SpaceLeftBraces.txt
@@ -2,8 +2,7 @@ class Foo {
     // function fBar (x,y);
     function fOne(argA:Int, argB, argC, argD, argE, argF, argG, argH){
         var numbers:Array< String> = ['one', 'two', 'three', 'four', 'five', 'six'];
-        var x = ("" + argA) + argB +
-        argC + argD + argE + argF + argG + argH;
+        var x = ("" + argA) + argB + argC + argD + argE + argF + argG + argH;
         try{
             this.fTwo(argA, argB, argC, this.fThree("", argE, argF, argG, argH));
         } catch (ignored:String){

diff --git a/src/test/resources/testData/formatter/SpaceOthers.txt b/src/test/resources/testData/formatter/SpaceOthers.txt
@@ -2,14 +2,13 @@ class Foo {
     // function fBar (x,y);
     function fOne(argA:Int , argB , argC , argD , argE , argF , argG , argH) {
         var numbers:Array< String> = ['one' ,'two' ,'three' ,'four' ,'five' ,'six'];
-        var x = ("" + argA) + argB +
-        argC + argD + argE + argF + argG + argH;
+        var x = ("" + argA) + argB + argC + argD + argE + argF + argG + argH;
         try {
             this.fTwo(argA , argB , argC , this.fThree("" , argE , argF , argG , argH));
         }catch (ignored:String) {
 
         }
-        var z = argA == 'Some string' ? 'yes' : 'no';
+        var z = argA == 'Some string'?'yes':'no';
         var colors = ['red' ,'green' ,'blue' ,'black' ,'white' ,'gray'];
         for (colorIndex in 0...colors.length) {
             var colorString = numbers[colorIndex];

diff --git a/src/test/resources/testData/formatter/SpaceWithin.txt b/src/test/resources/testData/formatter/SpaceWithin.txt
@@ -2,8 +2,7 @@ class Foo {
     // function fBar (x,y);
     function fOne( argA:Int, argB, argC, argD, argE, argF, argG, argH ) {
         var numbers:Array< String> = ['one', 'two', 'three', 'four', 'five', 'six'];
-        var x = ("" + argA) + argB +
-        argC + argD + argE + argF + argG + argH;
+        var x = ("" + argA) + argB + argC + argD + argE + argF + argG + argH;
         try {
             this.fTwo( argA, argB, argC, this.fThree( "", argE, argF, argG, argH ) );
         } catch ( ignored:String ) {