GROOVY-3421

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/GenericInferencingTests.java

@@ -404,14 +404,22 @@ public void testMap16() {
 
     @Test
     public void testMap17() {
+        String contents =
+            "def xxx = [*:[1:true]]\n";
+
+        assertType(contents, "xxx", "java.util.Map<java.lang.Integer,java.lang.Boolean>");
+    }
+
+    @Test
+    public void testMap18() {
         String contents =
             "def xxx = ['item'].collectEntries {str -> /*...*/}\n";
 
         assertType(contents, "xxx", "java.util.Map<java.lang.Object,java.lang.Object>");
     }
 
     @Test
-    public void testMap18() {
+    public void testMap19() {
         String contents =
             "def map = [key:'val']\n" +
             "map.getAt('key').toUpperCase()\n" +
@@ -444,7 +452,7 @@ public void testMap18() {
     }
 
     @Test
-    public void testMap19() {
+    public void testMap20() {
         String contents =
             "import groovy.transform.stc.*\n" +
             "def map = [key:'val']\n" +
@@ -499,7 +507,7 @@ public void testMap19() {
     }
 
     @Test // methods and property resolution differs
-    public void testMap20() {
+    public void testMap21() {
         String contents =
             "def map = [foo:'bar']\n" +
             "map.getMetaClass()\n" +
@@ -544,7 +552,7 @@ public void testMap20() {
     }
 
     @Test
-    public void testMap21() {
+    public void testMap22() {
         String contents =
             "LinkedHashMap<String,String> map = [foo:'bar']\n" +
             "def put = map.&put\n" +

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java

@@ -594,7 +594,7 @@ public void testModuleInfo() {
 
             "module-info.java",
             "module test.project {\n" +
-            "}",
+            "}\n",
         };
         //@formatter:on
 
@@ -614,13 +614,26 @@ public void testMultiCatch() {
             "    }\n" +
             "  }\n" +
             "  public static void foo() throws IOException { print 'foo' }\n" +
-            "}",
+            "}\n",
         };
         //@formatter:on
 
         runConformTest(sources, "foo");
     }
 
+    @Test // GROOVY-3421
+    public void testSpreadMap() {
+        //@formatter:off
+        String[] sources = {
+            "Script.groovy",
+            "int i = 1\n" +
+            "print([a:i, *:[b:++i]])\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "[a:1, b:2]");
+    }
+
     @Test
     public void testGreclipse719() {
         //@formatter:off

base/org.codehaus.groovy25/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java

@@ -2619,9 +2619,6 @@ protected Expression spreadMapExpression(AST node) {
         Expression expr = expression(exprNode);
         SpreadMapExpression spreadMapExpression = new SpreadMapExpression(expr);
         configureAST(spreadMapExpression, node);
-        // GRECLIPSE add -- sloc for node only covers the operator; must include the expression
-        setSourceEnd(spreadMapExpression, expr);
-        // GRECLIPSE end
         return spreadMapExpression;
     }
 

base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AsmClassGenerator.java

@@ -786,6 +786,7 @@ public void visitSpreadExpression(SpreadExpression expression) {
     }
 
     public void visitSpreadMapExpression(SpreadMapExpression expression) {
+        /* GRECLIPSE edit -- GROOVY-3421 (take 2)
         Expression subExpression = expression.getExpression();
         // to not record the underlying MapExpression twice,
         // we disable the assertion tracker
@@ -795,6 +796,10 @@ public void visitSpreadMapExpression(SpreadMapExpression expression) {
         controller.getOperandStack().box();
         spreadMap.call(controller.getMethodVisitor());
         controller.getAssertionWriter().reenableTracker();
+        */
+        callX(ClassHelper.make(java.util.Collections.class), "emptyMap").visit(this);
+        spreadMap.call(controller.getMethodVisitor());
+        // GRECLIPSE end
         controller.getOperandStack().replace(ClassHelper.OBJECT_TYPE);
     }
 

base/org.codehaus.groovy30/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java

@@ -2683,9 +2683,6 @@ protected Expression spreadMapExpression(AST node) {
         Expression expr = expression(exprNode);
         SpreadMapExpression spreadMapExpression = new SpreadMapExpression(expr);
         configureAST(spreadMapExpression, node);
-        // GRECLIPSE add -- sloc for node only covers the operator; must include the expression
-        setSourceEnd(spreadMapExpression, expr);
-        // GRECLIPSE end
         return spreadMapExpression;
     }
 

base/org.codehaus.groovy30/src/org/codehaus/groovy/classgen/AsmClassGenerator.java

@@ -769,6 +769,7 @@ public void visitSpreadExpression(final SpreadExpression expression) {
 
     @Override
     public void visitSpreadMapExpression(final SpreadMapExpression expression) {
+        /* GRECLIPSE edit -- GROOVY-3421 (take 2)
         Expression subExpression = expression.getExpression();
         // to not record the underlying MapExpression twice,
         // we disable the assertion tracker
@@ -778,6 +779,10 @@ public void visitSpreadMapExpression(final SpreadMapExpression expression) {
         controller.getOperandStack().box();
         spreadMap.call(controller.getMethodVisitor());
         controller.getAssertionWriter().reenableTracker();
+        */
+        callX(ClassHelper.make(java.util.Collections.class), "emptyMap").visit(this);
+        spreadMap.call(controller.getMethodVisitor());
+        // GRECLIPSE end
         controller.getOperandStack().replace(ClassHelper.OBJECT_TYPE);
     }
 

base/org.codehaus.groovy40/.checkstyle

@@ -38,6 +38,7 @@
         <file-match-pattern match-pattern="groovy/ast/tools/(Expression|Generics)Utils.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/ast/tools/WideningCategories.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/(Annotation|Enum|VariableScope)Visitor.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/classgen/AsmClassGenerator.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/(Extended)?Verifier.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/ClosureWriter.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticInvocationWriter.java" include-pattern="false" />

base/org.codehaus.groovy40/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java

@@ -2683,9 +2683,6 @@ protected Expression spreadMapExpression(AST node) {
         Expression expr = expression(exprNode);
         SpreadMapExpression spreadMapExpression = new SpreadMapExpression(expr);
         configureAST(spreadMapExpression, node);
-        // GRECLIPSE add -- sloc for node only covers the operator; must include the expression
-        setSourceEnd(spreadMapExpression, expr);
-        // GRECLIPSE end
         return spreadMapExpression;
     }