This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch release90 in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit aea5f1aba8e3f1eb8d290634030e718ce568a35d Author: Vikas Prabhakar <vikas.prabha...@oracle.com> AuthorDate: Fri Jun 1 06:42:11 2018 +0530 [NetBeans-778] Formatting issue with var declaration statement --- .../modules/java/source/save/Reformatter.java | 6 +++ .../modules/java/source/save/FormatingTest.java | 52 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) 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 20af393..ce1140e 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 @@ -1199,6 +1199,12 @@ public class Reformatter implements ReformatTask { if (node.getType() == null || scan(node.getType(), p)) { if (node.getType() != null) { spaces(1, fieldGroup); + }else { + if(tokens.token().id() == JavaTokenId.VAR){ + //Add space after 'var' token + addDiff(new Diff(tokens.offset() + 3, tokens.offset() + 3, " ")); + tokens.moveNext(); + } } if (!ERROR.contentEquals(node.getName())) accept(IDENTIFIER, UNDERSCORE); 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 59e8969..c360721 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 @@ -4457,6 +4457,58 @@ public class FormatingTest extends NbTestCase { reformat(doc, content, golden); } + public void testForVar1() 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" + + " var v = 10; \n" + + " }\n" + + "}\n"; + + String golden = + "package hierbas.del.litoral;\n\n" + + "public class Test {\n\n" + + " public static void main(String[] args) {\n" + + " var v = 10;\n" + + " }\n" + + "}\n"; + reformat(doc, content, golden); + } + + public void testForVar2() 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" + + " final var v = 10; \n" + + " }\n" + + "}\n"; + + String golden = + "package hierbas.del.litoral;\n\n" + + "public class Test {\n\n" + + " public static void main(String[] args) {\n" + + " final var v = 10;\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 jlah...@apache.org. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists