Fix for issue #468: record type reference for coercion expression "as T"

groovy · Feb 13, 2018 · 431e885 · 431e885
1 parent 6d13099
commit 431e885
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/....tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/TypeReferenceSearchTests.java b/....tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/TypeReferenceSearchTests.java
@@ -230,6 +230,31 @@ public void testShouldntFindClassDeclarationInScript() throws Exception {
         assertEquals("Should find no matches", 0, matches.size());
     }
 
+    @Test // https://github.com/groovy/groovy-eclipse/issues/468
+    public void testCoercion1() throws Exception {
+        String firstContents =
+            "package a\n" +
+            "interface First {\n" +
+            "  void meth();\n" +
+            "}\n";
+
+        String secondContents =
+            "package a\n" +
+            "class Second {\n" +
+            "  def m() {\n" +
+            "    return {->\n" +
+            "    } as First\n" +
+            "  }\n" +
+            "}\n";
+
+        List<SearchMatch> matches = getAllMatches(firstContents, secondContents, "a", "a", false);
+        assertEquals("Wrong count", 1, matches.size());
+
+        SearchMatch match = matches.get(0);
+        assertEquals("Wrong length", "First".length(), match.getLength());
+        assertEquals("Wrong offset", secondContents.indexOf("First"), match.getOffset());
+    }
+
     @Test // https://github.com/groovy/groovy-eclipse/issues/442
     public void testGenerics1() throws Exception {
         String firstContents =

diff --git a/...t.groovy.core/src/org/codehaus/jdt/groovy/integration/internal/GroovyIndexingVisitor.java b/...t.groovy.core/src/org/codehaus/jdt/groovy/integration/internal/GroovyIndexingVisitor.java
@@ -124,7 +124,8 @@ public void visitArrayExpression(ArrayExpression expression) {
     @Override
     public void visitCastExpression(CastExpression expression) {
         // NOTE: expression.getType() may refer to ClassNode behind "this" or "super"
-        if (expression.getEnd() > 0 && expression.getStart() == expression.getType().getStart()) {
+        if (expression.getEnd() > 0 && (/*cast:*/expression.getStart() == expression.getType().getStart() ||
+                                        /*coerce:*/expression.getEnd() == expression.getType().getEnd())) {
             visitTypeReference(expression.getType(), false, true);
         }
         super.visitCastExpression(expression);