refactor resolver

groovy · Jan 21, 2022 · 70b828e · 70b828e
1 parent 62fedca
commit 70b828e
Show file tree

Hide file tree

Showing 17 changed files with 396 additions and 290 deletions.
diff --git a/...vy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java b/...vy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java
@@ -737,8 +737,8 @@ public void testGreclipse719() {
             "----------\n" +
             "1. ERROR in Script.groovy (at line 2)\n" +
             "\tMethod[] methodArray = anInt.class.methods\n" +
-            "\t^^^^^^^^\n" +
-            "Groovy:unable to resolve class Method[]\n" +
+            "\t^^^^^^\n" +
+            "Groovy:unable to resolve class Method\n" +
             "----------\n");
     }
 
@@ -756,8 +756,8 @@ public void testGreclipse719_2() {
             "----------\n" +
             "1. ERROR in Script.groovy (at line 2)\n" +
             "\tMethod[][] methodMethodArray = anInt.class.methods\n" +
-            "\t^^^^^^^^^^\n" +
-            "Groovy:unable to resolve class Method[][]\n" +
+            "\t^^^^^^\n" +
+            "Groovy:unable to resolve class Method\n" +
             "----------\n");
     }
 

diff --git a/...oovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/InnerClassTests.java b/...oovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/InnerClassTests.java
@@ -183,6 +183,18 @@ public void testInnerTypeReferencing7() {
         runConformTest(sources);
     }
 
+    @Test // resolved through default imports
+    public void testInnerTypeReferencing8() {
+        //@formatter:off
+        String[] sources = {
+            "Script.groovy",
+            "Map.Entry e\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
+
     @Test
     public void testInnerClass1() {
         //@formatter:off

diff --git a/...jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/GrabTests.java b/...jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/GrabTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2021 the original author or authors.
+ * Copyright 2009-2022 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.
@@ -35,7 +35,7 @@ public void testGrab() {
             "}\n",
 
             "Test.groovy",
-            "@Grab('joda-time:joda-time:2.10.10')\n" +
+            "@Grab('joda-time:joda-time:2.10.10;transitive=false')\n" +
             "import org.joda.time.DateTime\n" +
             "void printDate() {\n" +
             "  def now = new DateTime()\n" +
@@ -49,10 +49,10 @@ public void testGrab() {
 
     /**
      * This program has a broken grab. Without changes we get a 'general error'
-     * recorded on the first line of the source file (big juicy exception).
-     * General error during conversion: Error grabbing Grapes -- [unresolved dependency: org.aspectj#aspectjweaver;1.x: not found]
+     * recorded on the first line of the source file:
+     * <tt>General error during conversion: Error grabbing Grapes -- [unresolved dependency: org.aspectj#aspectjweaver;1.x: not found]</tt>
      * <p>
-     * With grab improvements we get two errors - the missing dependency and the missing type (which is at the right version of that dependency!)
+     * With grab improvements we get two errors: the missing dependency and the missing type (which is at the right version of that dependency!)
      */
     @Test // GRECLIPSE-1669
     public void testGrabError() {
@@ -67,7 +67,7 @@ public void testGrabError() {
 
             "Test.groovy",
             "@Grapes([\n" +
-            "  @Grab(group='joda-time', module='joda-time', version='2.10.10'),\n" +
+            "  @Grab('joda-time:joda-time:2.10.10;transitive=false'),\n" +
             "  @Grab(group='org.aspectj', module='aspectjweaver', version='1.x')\n" +
             "])\n" +
             "class Test {\n" +
@@ -107,7 +107,7 @@ public void testGrabConfig() {
 
             "Test.groovy",
             "@GrabConfig(systemClassLoader=true)\n" +
-            "@Grab(group='mysql', module='mysql-connector-java', version='5.1.15')\n" +
+            "@Grab(group='mysql', module='mysql-connector-java', version='5.1.15', transitive=false)\n" +
             "class Test {\n" +
             "}\n",
         };
@@ -129,7 +129,7 @@ public void testGrabResolver() {
 
             "Test.groovy",
             "@GrabResolver(name='restlet', root='https://maven.restlet.talend.com')\n" +
-            "@Grab(group='org.restlet.jse', module='org.restlet', version='2.4.3')\n" +
+            "@Grab(group='org.restlet.jse', module='org.restlet', version='2.4.3', transitive=false)\n" +
             "import org.restlet.Restlet\n",
         };
         //@formatter:on

diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/ImportNode.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/ImportNode.java
@@ -167,7 +167,7 @@ public void setFieldNameExpr(Expression fieldNameExpr) {
     }
 
     public void setType(ClassNode type) {
-        this.type = type;
+        this.type = java.util.Objects.requireNonNull(type);
     }
 
     public String toString() {