Fix for #1190: BaseScript: custom script method visitation

groovy · Nov 6, 2020 · 7612b3e · 7612b3e
1 parent d874d9b
commit 7612b3e
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 1 deletion.
diff --git a/....tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/Groovy22InferencingTests.java b/....tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/Groovy22InferencingTests.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2009-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.eclipse.jdt.core.groovy.tests.search;
+
+import org.junit.Test;
+
+public final class Groovy22InferencingTests extends InferencingTestSuite {
+
+    @Test
+    public void testBaseScript1() {
+        //@formatter:off
+        String contents =
+            "abstract class Foo extends Script {\n" +
+            "  Number bar\n" +
+            "  Number baz() {}\n" +
+            "}\n" +
+            "@groovy.transform.BaseScript Foo foo\n" +
+            "def x = bar\n" +
+            "def y = baz()\n";
+        //@formatter:on
+        assertType(contents, "x", "java.lang.Number");
+        assertType(contents, "y", "java.lang.Number");
+    }
+
+    @Test
+    public void testBaseScript2() {
+        //@formatter:off
+        String contents =
+            "@BaseScript(Foo)\n" +
+            "import groovy.transform.BaseScript\n" +
+            "abstract class Foo extends Script {\n" +
+            "  Number bar\n" +
+            "  Number baz() {}\n" +
+            "}\n" +
+            "def x = bar\n" +
+            "def y = baz()\n";
+        //@formatter:on
+        assertType(contents, "x", "java.lang.Number");
+        assertType(contents, "y", "java.lang.Number");
+    }
+
+    @Test
+    public void testBaseScript3() {
+        //@formatter:off
+        String contents =
+            "@BaseScript(Foo)\n" +
+            "import groovy.transform.BaseScript\n" +
+            "abstract class Foo extends Script {\n" +
+            "  Number bar\n" +
+            "  Number baz() {}\n" +
+            "  abstract body()\n" +
+            "  def run() {\n" +
+            "    body()\n" +
+            "  }\n" +
+            "}\n" +
+            "def x = bar\n" +
+            "def y = baz()\n";
+        //@formatter:on
+        assertType(contents, "x", "java.lang.Number");
+        assertType(contents, "y", "java.lang.Number");
+    }
+}
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
@@ -394,7 +394,7 @@ public void visitJDT(final IType type, final ITypeRequestor requestor) {
 
                 // visit relocated @Memoized method bodies
                 for (MethodNode method : node.getMethods()) {
-                    if (method.getName().startsWith("memoizedMethodPriv$")) {
+                    if (method.getName().startsWith("memoizedMethodPriv$") || isCustomScriptBody(method)) {
                         scopes.add(new VariableScope(scopes.getLast(), method, method.isStatic()));
                         enclosingDeclarationNode = method;
                         try {
@@ -3100,6 +3100,11 @@ private static boolean isArithmeticOperationOnListOrNumberOrString(final String
         }
     }
 
+    private static boolean isCustomScriptBody(final MethodNode node) {
+        return node.getDeclaringClass().isScript() && !node.isScriptBody() &&
+            Boolean.TRUE.equals(node.getNodeMetaData(MethodNode.SCRIPT_BODY_METHOD_KEY));
+    }
+
     private static boolean isEnumInit(final MethodCallExpression node) {
         return (node.getType().isEnum() && node.getMethodAsString().equals("$INIT"));
     }

diff --git a/ide-test/org.codehaus.groovy.alltests/src/org/codehaus/groovy/alltests/GroovyJDTTests.groovy b/ide-test/org.codehaus.groovy.alltests/src/org/codehaus/groovy/alltests/GroovyJDTTests.groovy
@@ -89,6 +89,7 @@ import org.junit.runners.Suite
     org.eclipse.jdt.core.groovy.tests.search.GenericsMappingTests,
     org.eclipse.jdt.core.groovy.tests.search.Groovy20InferencingTests,
     org.eclipse.jdt.core.groovy.tests.search.Groovy21InferencingTests,
+    org.eclipse.jdt.core.groovy.tests.search.Groovy22InferencingTests,
     org.eclipse.jdt.core.groovy.tests.search.Groovy25InferencingTests,
     org.eclipse.jdt.core.groovy.tests.search.InferencingTests,
     org.eclipse.jdt.core.groovy.tests.search.JDTPropertyNodeInferencingTests,