Fix for primitive array initializer

#412
groovy · Apr 19, 2018 · 7b42918 · 7b42918
1 parent a94893e
commit 7b42918
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/base/org.codehaus.groovy26/src/org/apache/groovy/parser/antlr4/AstBuilder.java b/base/org.codehaus.groovy26/src/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -3533,7 +3533,7 @@ public Expression visitCreator(CreatorContext ctx) {
                     ctx);
             */
             ConstructorCallExpression constructorCallExpression = new ConstructorCallExpression(classNode, arguments);
-            ASTNode nameNode = configureAST(new ConstantExpression(classNode.getName()), ctx.createdName().qualifiedClassName());
+            ASTNode nameNode = configureAST(new ConstantExpression(classNode.getName()), ctx.createdName());
             constructorCallExpression.setNameStart(nameNode.getStart());
             constructorCallExpression.setNameEnd(nameNode.getEnd() - 1);
             return configureAST(constructorCallExpression, ctx);
@@ -3616,8 +3616,10 @@ public Expression visitCreator(CreatorContext ctx) {
                 componentType = componentType.getComponentType();
                 configureAST(componentType, ctx, configureAST(new ConstantExpression(""), annOptCtxt.get(i)));
             }
-            ASTNode nameNode = configureAST(new ConstantExpression(""), ctx.createdName().qualifiedClassName());
-            arrayExpression.setNameStart(nameNode.getStart()); arrayExpression.setNameEnd(nameNode.getEnd() - 1);
+
+            ASTNode nameNode = configureAST(new ConstantExpression(classNode.getName()), ctx.createdName());
+            arrayExpression.setNameStart(nameNode.getStart());
+            arrayExpression.setNameEnd(nameNode.getEnd() - 1);
             // GRECLIPSE end
             return configureAST(arrayExpression, ctx);
         }