Merge pull request apache#8484 from naren2605/origin-master

fixing formatter issues

Author: lahodaj

ide/editor.document/src/org/netbeans/api/editor/document/LineDocumentUtils.java

@@ -30,7 +30,6 @@
 import org.netbeans.modules.editor.document.DocumentServices;
 import org.netbeans.modules.editor.document.TextSearchUtils;
 import org.netbeans.modules.editor.document.implspi.CharClassifier;
-import org.netbeans.modules.editor.lib2.AcceptorFactory;
 import org.netbeans.spi.editor.document.DocumentFactory;
 import org.openide.util.Lookup;
 

java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java

@@ -2565,7 +2565,36 @@ public Boolean visitIf(final IfTree node, Void p) {
             StatementTree elseStat = node.getElseStatement();
             CodeStyle.BracesGenerationStyle redundantIfBraces = cs.redundantIfBraces();
             int eoln = findNewlineAfterStatement(node);
-            if ((elseStat != null && redundantIfBraces == CodeStyle.BracesGenerationStyle.ELIMINATE && danglingElseChecker.hasDanglingElse(node.getThenStatement())) ||
+            Boolean hasErrThenStatement = node.getThenStatement() instanceof ExpressionStatementTree thenStatement
+                                          && thenStatement.getExpression() instanceof ErroneousTree;
+            if (hasErrThenStatement) {
+                if (getCurrentPath().getParentPath().getLeaf() instanceof BlockTree parentStTree) {
+                    boolean isPreviousIfTree = false;
+                    int endPositionOfErrThenStatement = endPos;
+                    for (StatementTree statement : parentStTree.getStatements()) {
+                        if (isPreviousIfTree) {
+                            int startPositionOfNextErrorStatement = (int) sp.getStartPosition(getCurrentPath().getCompilationUnit(), statement);
+                            endPositionOfErrThenStatement = startPositionOfNextErrorStatement;
+                            break;
+                        } else if (statement == node) {
+                            isPreviousIfTree = true;
+                            endPositionOfErrThenStatement = (int) sp.getEndPosition(getCurrentPath().getCompilationUnit(), parentStTree) - 1;
+                        }
+
+                    }
+                    if (isPreviousIfTree) {
+                        while (tokens.offset() <= endPositionOfErrThenStatement && endPositionOfErrThenStatement != -1) {
+                            tokens.moveNext();
+                        }
+                        tokens.movePrevious();
+                        if (endPositionOfErrThenStatement != -1) {
+                            endPos = endPositionOfErrThenStatement;
+                        }
+                    }
+                }
+            }
+            
+            if (hasErrThenStatement || (elseStat != null && redundantIfBraces == CodeStyle.BracesGenerationStyle.ELIMINATE && danglingElseChecker.hasDanglingElse(node.getThenStatement())) ||
                     (redundantIfBraces == CodeStyle.BracesGenerationStyle.GENERATE && (startOffset > sp.getStartPosition(root, node) || endOffset < eoln || node.getCondition().getKind() == Tree.Kind.ERRONEOUS))) {
                 redundantIfBraces = CodeStyle.BracesGenerationStyle.LEAVE_ALONE;
             }

java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java

@@ -1556,6 +1556,76 @@ public void run(WorkingCopy workingCopy) throws java.io.IOException {
         preferences.putBoolean("specialElseIf", false);
         reformat(doc, content, golden);
         preferences.putBoolean("specialElseIf", true);
+        
+       content = """
+                  package hierbas.del.litoral;
+                  class Test extends Integer implements Runnable, Serializable{
+                  public void run(){
+                     if ("foo".contains("bar"))))) )))  {
+                                System.out.println("bar");
+                    }
+                  }
+                  }
+                 """;
+        golden = """
+                 package hierbas.del.litoral;
+                 
+                 class Test extends Integer implements Runnable, Serializable {
+                 
+                     public void run() {
+                         if ("foo".contains("bar"))))) )))  {
+                             System.out.println("bar");
+                         }
+                     }
+                 }
+                 """;
+       reformat(doc, content, golden);
+       
+       content = """
+                  package hierbas.del.litoral;
+                  class Test extends Integer implements Runnable, Serializable{
+                  public void run(){
+                     if ("foo".contains("bar"))))) ))) 
+                  }
+                  }
+                 """;
+        golden = """
+                 package hierbas.del.litoral;
+                 
+                 class Test extends Integer implements Runnable, Serializable {
+                 
+                     public void run() {
+                         if ("foo".contains("bar"))))) )))
+                     }
+                 }
+                 """;
+       reformat(doc, content, golden);
+       
+       content = """
+                  package hierbas.del.litoral;
+                  class Test extends Integer implements Runnable, Serializable{
+                  public void run(){
+                     if ("foo".contains("bar"))))) ))) 
+                 else {
+                       System.out.println("bar2")
+                    }
+                  }
+                  }
+                 """;
+        golden = """
+                 package hierbas.del.litoral;
+                 
+                 class Test extends Integer implements Runnable, Serializable {
+                 
+                     public void run() {
+                         if ("foo".contains("bar"))))) )))
+                 else {
+                                     System.out.println("bar2")
+                                 }
+                     }
+                 }
+                 """;
+       reformat(doc, content, golden);
     }
 
     public void testWhile() throws Exception {