eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 14:19:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4200 from GKFX/autoformat

Browse Source 
Fix minor autoformatter bugs. Fixes #4185.
This commit is contained in:
Ben Fry
2016-02-13 10:11:43 -05:00
parent cb57ea9555 cbf974630b
commit a464a7a6e5
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/src/processing/mode/java/AutoFormat.java
View File

@@ -587,6 +587,7 @@ public class AutoFormat implements Formatter {
break;
}
// In a simple enum, there's not necessarily a `;` to end the statement.
inStatementFlag = false;
curlyLvl--;
@@ -606,6 +607,7 @@ public class AutoFormat implements Formatter {
trimRight(result);
result.append('\n');
overflowFlag = false; // Would normally be done in writeIndentedLine.
printIndentation();
result.append(c);
if (peek() == ';') result.append(nextChar());
@@ -728,10 +730,14 @@ public class AutoFormat implements Formatter {
inStatementFlag = false;
arrayLevel = -1; // Unlikely to be needed; just in case.
//Same format for case, default, and other labels.
tabs--;
writeIndentedLine();
tabs++;
// Same format for case, default, and other labels.
if (tabs > 0) {
tabs--;
writeIndentedLine();
tabs++;
} else {
writeIndentedLine();
}
readForNewLine();
writeIndentedLine();