[NETBEANS-97] Improve java source reformatting of try and synchronized blocks with control structures

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 9.0
• Fix Version/s: 11.2
• Component/s: java - Source
• Labels: pull-request-available
• Flags: Patch
• External issue URL: https://netbeans.org/bugzilla/show_bug.cgi?id=269050
• Assignee: mike duigou
• Reporter: mike duigou
• Created: 21/Oct/17 20:43
• Updated: 03/Nov/20 15:51
• Resolved: 09/Sep/19 22:41

Description

This issue recreates https://netbeans.org/bugzilla/show_bug.cgi?id=269050 Netbeans bug 269050. New bug database, new hope for integration!

Currently the java source reformatter (java.source.base org.netbeans.modules.java.source.save.Reformatter) does not treat try and synchronized blocks as blocks when it encounters them with control structures. So

if (foo == bar) try {
   baz();
} catch (Exception all) {
   log.(....);
}

is reformatted as :

if (foo == bar) {
  try {
    baz();
  } catch (Exception all) {
    log.(....);
  }
}

The additional added basic block layer is not needed as the try is already a block. The same applies for a synchronized block as well.

if (foo == bar) synchronized(quux) {
   baz();
}

is currently reformatted as :

if (foo == bar) {
  synchronized(quux) {
    baz();
  }
}

In addition to "if/else" this formatting all affects other control structures such as "for", "for-each" and "while".

Line breaks are preserved so existing source

if (foo == bar) {
  synchronized(quux) {
    baz();
  }
}

will be reformatted with line breaks intact--only the braces will be removed

if (foo == bar) 
  synchronized(quux) {
    baz();
  }

Issue Links

• links to: GitHub Pull Request #173
• links to: GitHub Pull Request #173
• links to: GitHub Pull Request #1392