GRECLIPSE-554 Just simple fix and test for Groovy-like way of accessi…

…ng map values. Treat any map value as Object.
groovy · Oct 22, 2014 · 7ea792e · 7ea792e
1 parent c952492
commit 7ea792e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 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
@@ -1834,6 +1834,22 @@ public void testInstanceOf4() throws Exception {
 		assertType(contents, start, end, "java.lang.Integer");
 	}
 
+    // GRECLIPSE-554
+    public void testMapEntries1() throws Exception {
+        String contents =
+                "def map = [:]\n" +
+                "map.foo = 1\n" +
+                "print map.foo";
+
+        int start = contents.lastIndexOf("map");
+        int end = start + "map".length();
+        assertType(contents, start, end, "java.util.Map<java.lang.Object,java.lang.Object>");
+
+        start = contents.lastIndexOf("foo");
+        end = start + "foo".length();
+        assertType(contents, start, end, "java.lang.Object");
+    }
+
 	public void testThisInInnerClass1() {
 		String contents =
 				"class A {\n" +

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
@@ -2034,6 +2034,10 @@ private TypeLookupResult lookupExpressionType(Expression node, ClassNode objectE
 				}
 			}
 		}
+		if (result.confidence == TypeConfidence.UNKNOWN && VariableScope.MAP_CLASS_NODE.equals(result.declaringType)) {
+			result = new TypeLookupResult(VariableScope.OBJECT_CLASS_NODE, result.declaringType, result.declaration,
+					TypeConfidence.POTENTIAL, result.scope);
+		}
 		return result;
 	}