Fix for #1024: Map<String,Object> for named args list

groovy · Feb 20, 2020 · f678488 · f678488
1 parent e02503d
commit f678488
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/...ovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/InferencingTests.java b/...ovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/InferencingTests.java
@@ -3479,4 +3479,16 @@ public void testMethodOverloadsArgumentMatching9() {
 
         assertType(contents, "n", "java.lang.Number");
     }
+
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1024
+    public void testMethodOverloadsArgumentMatching10() {
+        String contents =
+            "byte meth(String s) {\n" +
+            "}\n" +
+            "char meth(Map args) {\n" +
+            "}\n" +
+            "meth(name:null)\n";
+
+        assertType(contents, "meth", "java.lang.Character");
+    }
 }
diff --git a/...dt.groovy.core/src/org/eclipse/jdt/groovy/search/TypeInferencingVisitorWithRequestor.java b/...dt.groovy.core/src/org/eclipse/jdt/groovy/search/TypeInferencingVisitorWithRequestor.java
@@ -2101,9 +2101,18 @@ private MethodNode findLazyMethod(final String fieldName) {
     private List<ClassNode> getMethodCallArgumentTypes(ASTNode node) {
         if (node instanceof MethodCall) {
             Expression arguments = ((MethodCall) node).getArguments();
-            if (arguments instanceof ArgumentListExpression) {
-                List<Expression> expressions = ((ArgumentListExpression) arguments).getExpressions();
+            if (arguments instanceof TupleExpression) {
+                List<Expression> expressions = ((TupleExpression) arguments).getExpressions();
                 if (isNotEmpty(expressions)) {
+                    if (expressions.get(0) instanceof NamedArgumentListExpression) {
+                        if (node instanceof ConstructorCallExpression) {
+                            return Collections.emptyList(); // default constructor
+                        } else {
+                            return Collections.singletonList(createParameterizedMap(
+                                VariableScope.STRING_CLASS_NODE, VariableScope.OBJECT_CLASS_NODE));
+                        }
+                    }
+
                     List<ClassNode> types = new ArrayList<>(expressions.size());
                     for (Expression expression : expressions) {
                         ClassNode exprType = expression.getType();
@@ -2150,7 +2159,6 @@ private List<ClassNode> getMethodCallArgumentTypes(ASTNode node) {
                     return types;
                 }
             }
-            // TODO: Might be useful to look into TupleExpression
             return Collections.emptyList();
         }