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

Merge pull request #2477 from AmnonOwed/Fix#364-AutoFormatIfElse

Browse Source 
Fix #364 if-else autoformatting
This commit is contained in:
Ben Fry
2014-05-10 19:25:19 -04:00
parent bbd091543e b6da3317fb
commit 4806400cb9
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/processing/mode/java/AutoFormat.java
View File

@@ -133,7 +133,7 @@ public class AutoFormat implements Formatter {
private void writeIndentedLine() {
if (buf.length() == 0) {
if (s_flag) {
s_flag = a_flg = false;
s_flag = a_flg = e_flg = false;
}
return;
}
@@ -150,9 +150,26 @@ public class AutoFormat implements Formatter {
}
a_flg = false;
}
if (e_flg) {
if (lastNonSpaceChar() == '}') {
trimRight(result);
result.append(" ");
}
e_flg = false;
}
result.append(buf);
buf.setLength(0);
}
private char lastNonSpaceChar() {
for (int i=result.length()-1; i>=0; i--) {
char c_i = result.charAt(i);
if (c_i == ' ' || c_i == '\n') continue;
else return c_i;
}
return 0;
}
private void writeIndentedComment() {
@@ -371,16 +388,12 @@ public class AutoFormat implements Formatter {
case ' ':
case '\t':
if (lookup("else")) {
e_flg = lookup("else");
if (e_flg) {
gotelse();
if ((!s_flag) || buf.length() > 0) {
buf.append(c);
}
// // issue https://github.com/processing/processing/issues/364
// s_flag = false;
// trimRight(result);
// result.append(" ");
writeIndentedLine();
s_flag = false;
break;
@@ -418,7 +431,8 @@ public class AutoFormat implements Formatter {
break;
case '{':
if (lookup("else")) {
e_flg = lookup("else");
if (e_flg) {
gotelse();
}
if (s_if_lev.length == c_level) {