This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new e687856 [NETBEANS-536] Fixing reformatter to handle fors that don't
have condition. (#472)
e687856 is described below
commit e68785656df67eb6cdd1dedd70ff9613e21fdfb9
Author: Jan Lahoda <[email protected]>
AuthorDate: Mon Apr 2 23:12:38 2018 +0200
[NETBEANS-536] Fixing reformatter to handle fors that don't have condition.
(#472)
---
.../modules/java/source/save/Reformatter.java | 2 +-
.../modules/java/source/save/FormatingTest.java | 26 ++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git
a/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
b/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
index 433493d..20af393 100644
---
a/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
+++
b/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
@@ -2509,7 +2509,7 @@ public class Reformatter implements ReformatTask {
lastIndent = indent;
CodeStyle.BracesGenerationStyle redundantForBraces =
cs.redundantForBraces();
int eoln = findNewlineAfterStatement(node);
- if (redundantForBraces == CodeStyle.BracesGenerationStyle.GENERATE
&& (startOffset > sp.getStartPosition(root, node) || endOffset < eoln ||
node.getCondition().getKind() == Tree.Kind.ERRONEOUS)) {
+ if (redundantForBraces == CodeStyle.BracesGenerationStyle.GENERATE
&& (startOffset > sp.getStartPosition(root, node) || endOffset < eoln ||
(node.getCondition() != null && node.getCondition().getKind() ==
Tree.Kind.ERRONEOUS))) {
redundantForBraces =
CodeStyle.BracesGenerationStyle.LEAVE_ALONE;
}
wrapStatement(cs.wrapForStatement(), redundantForBraces,
cs.spaceBeforeForLeftBrace() ? 1 : 0, node.getStatement());
diff --git
a/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
b/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
index d316fe7..59e8969 100644
---
a/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
+++
b/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
@@ -4431,6 +4431,32 @@ public class FormatingTest extends NbTestCase {
reformat(doc, content, golden);
}
+ public void testForNoCondition() throws Exception {
+ testFile = new File(getWorkDir(), "Test.java");
+ TestUtilities.copyStringToFile(testFile, "");
+ FileObject testSourceFO = FileUtil.toFileObject(testFile);
+ DataObject testSourceDO = DataObject.find(testSourceFO);
+ EditorCookie ec =
(EditorCookie)testSourceDO.getCookie(EditorCookie.class);
+ final Document doc = ec.openDocument();
+ doc.putProperty(Language.class, JavaTokenId.language());
+ String content =
+ "package hierbas.del.litoral;\n\n"
+ + "public class Test {\n\n"
+ + " public static void main(String[] args) {\n"
+ + " for (;;);\n"
+ + " }\n"
+ + "}\n";
+
+ String golden =
+ "package hierbas.del.litoral;\n\n"
+ + "public class Test {\n\n"
+ + " public static void main(String[] args) {\n"
+ + " for (;;);\n"
+ + " }\n"
+ + "}\n";
+ reformat(doc, content, golden);
+ }
+
private void reformat(Document doc, String content, String golden) throws
Exception {
reformat(doc, content, golden, 0, content.length());
}
--
To stop receiving notification emails like this one, please contact
[email protected].
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
