Consider navigable element in equality - seems to fix psi outdated (#860

)

* Consider navigation element in PSI equality checks

This seems to solve issues related to psi becoming outdated.
Extension of comment by ajchun:
mplushnikov/lombok-intellij-plugin#840 (comment)

Covers issues: #821, #827, #829, #840, #842, #844, #846, #850, #853, #854, #855, #857

* Remove debug logging related to equality of PsiElements

GitOrigin-RevId: e9ad9801b15dc91b872b14add012a9261033fbc7

plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightClassBuilder.java

@@ -187,6 +187,10 @@ public boolean equals(Object o) {
 
     LombokLightClassBuilder that = (LombokLightClassBuilder) o;
 
+    if(getNavigationElement() != this && !getNavigationElement().equals(that.getNavigationElement())) {
+      return false;
+    }
+
     return myQualifiedName.equals(that.myQualifiedName);
   }
 

plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightFieldBuilder.java

@@ -138,6 +138,10 @@ public boolean isEquivalentTo(PsiElement another) {
           (null != containingClass && containingClass.isEquivalentTo(anotherContainingClass));
       }
 
+      if(getNavigationElement() != this && !getNavigationElement().equals(anotherLightField.getNavigationElement())) {
+        stillEquivalent = false;
+      }
+
       return stillEquivalent;
     } else {
       return super.isEquivalentTo(another);

plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightIdentifier.java

@@ -5,6 +5,8 @@
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.impl.light.LightIdentifier;
 
+import java.util.Objects;
+
 /**
  * Date: 12.10.13 Time: 23:27
  */
@@ -47,7 +49,11 @@ public boolean equals(Object o) {
 
     LombokLightIdentifier that = (LombokLightIdentifier) o;
 
-    return !(myText != null ? !myText.equals(that.myText) : that.myText != null);
+    if(getNavigationElement() != this && !getNavigationElement().equals(that.getNavigationElement())) {
+      return false;
+    }
+
+    return Objects.equals(myText, that.myText);
 
   }
 

plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightMethodBuilder.java

@@ -287,6 +287,11 @@ public boolean equals(Object o) {
     if (!getParameterList().equals(that.getParameterList())) {
       return false;
     }
+
+    if(getNavigationElement() != this && !getNavigationElement().equals(that.getNavigationElement())) {
+      return false;
+    }
+
     return Objects.equals(myReturnTypeAsText, that.myReturnTypeAsText);
   }
 

plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightModifierList.java

@@ -115,6 +115,10 @@ public boolean equals(Object o) {
 
     LombokLightModifierList that = (LombokLightModifierList) o;
 
+    if (getNavigationElement() != this && !getNavigationElement().equals(that.getNavigationElement())) {
+      return false;
+    }
+
     return myAnnotations.equals(that.myAnnotations);
   }
 

plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightParameter.java

@@ -77,6 +77,10 @@ public boolean equals(Object o) {
       return false;
     }
 
+    if(getNavigationElement() != this && !getNavigationElement().equals(that.getNavigationElement())) {
+      return false;
+    }
+
     return thisType.getCanonicalText().equals(thatType.getCanonicalText());
   }
 

plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/psi/LombokLightParameterListBuilder.java

@@ -7,6 +7,7 @@
 import java.util.Arrays;
 
 public class LombokLightParameterListBuilder extends LightParameterListBuilder {
+
   public LombokLightParameterListBuilder(PsiManager manager, Language language) {
     super(manager, language);
   }
@@ -26,6 +27,10 @@ public boolean equals(Object o) {
       return false;
     }
 
+    if(getNavigationElement() != this && !getNavigationElement().equals(that.getNavigationElement())) {
+      return false;
+    }
+
     return Arrays.equals(getParameters(), that.getParameters());
   }