GROOVY-10249 (pt.2)

groovy · Oct 2, 2021 · 97e2b0f · 97e2b0f
1 parent 1c7dd66
commit 97e2b0f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/ClassNode.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/ast/ClassNode.java
@@ -775,14 +775,19 @@ public void addInterface(ClassNode type) {
         }
     }
 
-    public boolean equals(Object o) {
-        // GRECLIPSE add
-        if (o==null) return false;
-        // GRECLIPSE end
+    public boolean equals(final Object that) {
+        /* GRECLIPSE edit -- GROOVY-10249, et al.
         if (redirect!=null) return redirect().equals(o);
         if (!(o instanceof ClassNode)) return false;
         ClassNode cn = (ClassNode) o;
         return (cn.getText().equals(getText()));
+        */
+        if (that == this) return true;
+        if (!(that instanceof ClassNode)) return false;
+        if (redirect != null) return redirect.equals(that);
+        if (componentType != null) return componentType.equals(((ClassNode) that).componentType);
+        return ((ClassNode) that).getText().equals(getText()); // arrays could be "T[]" or "[LT;"
+        // GRECLIPSE end
     }
 
     public int hashCode() {

diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/ClassNode.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/ClassNode.java
@@ -735,7 +735,8 @@ public boolean equals(Object that) {
         if (that == this) return true;
         if (!(that instanceof ClassNode)) return false;
         if (redirect != null) return redirect.equals(that);
-        return (((ClassNode) that).getText().equals(getText()));
+        if (componentType != null) return componentType.equals(((ClassNode) that).componentType);
+        return ((ClassNode) that).getText().equals(getText()); // arrays could be "T[]" or "[LT;"
     }
 
     public int hashCode() {

diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/ast/ClassNode.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/ast/ClassNode.java
@@ -766,7 +766,8 @@ public boolean equals(Object that) {
         if (that == this) return true;
         if (!(that instanceof ClassNode)) return false;
         if (redirect != null) return redirect.equals(that);
-        return (((ClassNode) that).getText().equals(getText()));
+        if (componentType != null) return componentType.equals(((ClassNode) that).componentType);
+        return ((ClassNode) that).getText().equals(getText()); // arrays could be "T[]" or "[LT;"
     }
 
     @Override