Fix for #990: use redirect for reference comparison

groovy · Nov 11, 2019 · 3239180 · 3239180
1 parent cbdc80d
commit 3239180
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 1 deletion.
diff --git a/base/org.codehaus.groovy24/src/org/codehaus/groovy/ast/ClassHelper.java b/base/org.codehaus.groovy24/src/org/codehaus/groovy/ast/ClassHelper.java
@@ -347,6 +347,9 @@ public static ClassNode getUnwrapper(ClassNode cn) {
      * @see #make(String)
      */
     public static boolean isPrimitiveType(ClassNode cn) {
+        // GRECLIPSE add
+        cn = cn.redirect();
+        // GRECLIPSE end
         return cn == boolean_TYPE ||
                 cn == char_TYPE ||
                 cn == byte_TYPE ||
@@ -371,6 +374,9 @@ public static boolean isPrimitiveType(ClassNode cn) {
      * @see #make(String)
      */
     public static boolean isStaticConstantInitializerType(ClassNode cn) {
+        // GRECLIPSE add
+        cn = cn.redirect();
+        // GRECLIPSE end
         return cn == int_TYPE ||
                 cn == float_TYPE ||
                 cn == long_TYPE ||
@@ -383,6 +389,9 @@ public static boolean isStaticConstantInitializerType(ClassNode cn) {
     }
 
     public static boolean isNumberType(ClassNode cn) {
+        // GRECLIPSE add
+        cn = cn.redirect();
+        // GRECLIPSE end
         return cn == Byte_TYPE ||
                 cn == Short_TYPE ||
                 cn == Integer_TYPE ||

diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/ClassHelper.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/ClassHelper.java
@@ -355,6 +355,9 @@ public static boolean isPrimitiveType(ClassNode cn) {
      * @see #make(String)
      */
     public static boolean isStaticConstantInitializerType(ClassNode cn) {
+        // GRECLIPSE add
+        cn = cn.redirect();
+        // GRECLIPSE end
         return cn == int_TYPE ||
                 cn == float_TYPE ||
                 cn == long_TYPE ||
@@ -367,6 +370,9 @@ public static boolean isStaticConstantInitializerType(ClassNode cn) {
     }
 
     public static boolean isNumberType(ClassNode cn) {
+        // GRECLIPSE add
+        cn = cn.redirect();
+        // GRECLIPSE end
         return cn == Byte_TYPE ||
                 cn == Short_TYPE ||
                 cn == Integer_TYPE ||

diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/ClassHelper.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/ClassHelper.java
@@ -384,6 +384,9 @@ public static boolean isPrimitiveType(ClassNode cn) {
      * @see #make(String)
      */
     public static boolean isStaticConstantInitializerType(ClassNode cn) {
+        // GRECLIPSE add
+        cn = cn.redirect();
+        // GRECLIPSE end
         return cn == int_TYPE ||
                 cn == float_TYPE ||
                 cn == long_TYPE ||
@@ -396,6 +399,9 @@ public static boolean isStaticConstantInitializerType(ClassNode cn) {
     }
 
     public static boolean isNumberType(ClassNode cn) {
+        // GRECLIPSE add
+        cn = cn.redirect();
+        // GRECLIPSE end
         return cn == Byte_TYPE ||
                 cn == Short_TYPE ||
                 cn == Integer_TYPE ||

diff --git a/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/core/util/GroovyUtils.java b/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/core/util/GroovyUtils.java
@@ -263,7 +263,7 @@ public static String getTypeSignatureWithoutGenerics(ClassNode node, boolean qua
     }
 
     public static ClassNode getWrapperTypeIfPrimitive(ClassNode type) {
-        if (ClassHelper.isPrimitiveType(type) && !ClassHelper.VOID_TYPE.equals(type)) {
+        if (type != null && ClassHelper.isPrimitiveType(type) && !ClassHelper.VOID_TYPE.equals(type)) {
             return ClassHelper.getWrapper(type);
         }
         return type;

diff --git a/...vy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/ui/SemanticHighlightingTests.groovy b/...vy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/ui/SemanticHighlightingTests.groovy
@@ -978,6 +978,24 @@ final class SemanticHighlightingTests extends GroovyEclipseTestSuite {
             new HighlightedTypedPosition(contents.lastIndexOf('zero'), 4, METHOD_CALL))
     }
 
+    @Test
+    void testMultiAssign1() {
+        String contents = '''\
+            |@groovy.transform.CompileStatic
+            |void meth() {
+            |  def (Integer i, String s) = [123, 'abc']
+            |}
+            |'''.stripMargin()
+
+        assertHighlighting(contents,
+            new HighlightedTypedPosition(contents.indexOf('meth'), 4, METHOD),
+            new HighlightedTypedPosition(contents.indexOf('Integer'), 7, CLASS),
+            new HighlightedTypedPosition(contents.indexOf('i,'), 1, VARIABLE),
+            new HighlightedTypedPosition(contents.indexOf('String'), 6, CLASS),
+            new HighlightedTypedPosition(contents.indexOf('s)'), 1, VARIABLE),
+            new HighlightedTypedPosition(contents.indexOf('123'), 3, NUMBER))
+    }
+
     @Test
     void testCatchParam() {
         // don't want PARAMETER