From f668c2bfc4c45ac9df9e11a9c0e5c260f36d7365 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 19 May 2015 16:52:55 +0200
Subject: [PATCH] clear cls method hierarchy cache not only on root change
 (EA-68165 - PIEAE: ClsRepositoryPsiElement.getManager)

---
 .../psi/impl/PsiSuperMethodImplUtil.java      |  11 ++++------
 .../methodHierarchy/AbstractMessageLite.class | Bin 0 -> 2657 bytes
 .../methodHierarchy/MessageLite.class         | Bin 0 -> 817 bytes
 .../psi/resolve/ResolveInLibrariesTest.groovy |  20 ++++++++++++++++++
 .../psi/PsiInvalidElementAccessException.java |  10 +++++++--
 5 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 java/java-tests/testData/libResolve/methodHierarchy/AbstractMessageLite.class
 create mode 100644 java/java-tests/testData/libResolve/methodHierarchy/MessageLite.class

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java
index 85d22f0077d4..7966b5a89fc2 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java
@@ -18,7 +18,6 @@ package com.intellij.psi.impl;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ProjectRootModificationTracker;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.*;
@@ -395,12 +394,10 @@ public class PsiSuperMethodImplUtil {
           result = new HierarchicalMethodSignatureImpl((MethodSignatureBackedByPsiMethod)method.getSignature(PsiSubstitutor.EMPTY));
         }
 
-        Project project = aClass == null ? method.getProject() : aClass.getProject();
-        // cache Cls method hierarchy until root changed
-        Object dependency = method instanceof PsiCompiledElement ? ProjectRootModificationTracker.getInstance(project) :
-                            !method.isPhysical() ? method :
-                            PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT;
-        return CachedValueProvider.Result.create(result, dependency);
+        if (!method.isPhysical()) {
+          return CachedValueProvider.Result.create(result, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT, method);
+        }
+        return CachedValueProvider.Result.create(result, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
       }
     };
 
diff --git a/java/java-tests/testData/libResolve/methodHierarchy/AbstractMessageLite.class b/java/java-tests/testData/libResolve/methodHierarchy/AbstractMessageLite.class
new file mode 100644
index 0000000000000000000000000000000000000000..8458684e52762041620050d59bbd4780a711c304
GIT binary patch
literal 2657
zcmb7GTUQfT7~Mkx1H;HwDNxi<u!ckkh}u@<j@s04k&70wt&`-C42GGk$wX@ZLf`sJ
z><hALSNq-{)zy7wVlpfS+CI#=ewTgr_nq&|Uw{Ah2Y@M98u~D+;R@z7%ws{r4J^v(
zk{m6oSW)q?6^}Hu;<1LWk(SLjt#~5)jBHkAvnHE$*=(qIs-YK~Dz;Q?tJqQTOo6&o
zHA{KnDA3cEC7k7wQK^WEf|duSWx8_;BJnZGMVIZoP|%q%EwNTT%nE1Q$d<U$ld*F~
z>6zh}a$Z}Ex<!*V#xgnkFjcVaLP?~`j_umn>V9f5TX7vD=dOxM#VCl3>53V;ckQLO
zuGn%N(<&(VEFP}hkfBb*uDU9oQ(2<R*N-wD>bIdf8Wg7;h3B}EIWXQBDbr4+*B}0v
z6J^)5E$+4ZxE3A9cuN}MV|z;^#}Sok$yLzg%?P7h<?LptU(eaPC&JSS<B(R>BZtS{
zwiOJ->yA&!NYeYlw-jjPabGxF=1)Yfq=_;o3GfYYyM6!$q04i%B1+~VUFM}vts)q%
z61DRRVwO1Cv1G7oOSQPvZ78^VPB1Q1<0-W*yXxe`BU2_ye@NUXB<DIl#gL9~v8&>R
zjy=58@g2U`F^L~^yuyfr-jLWR81z<4hE+&yRxQ^&6ambSw`yl(I>lT&X2crtkGVxh
z9K{SP7Kn8$UMbquQl5Og5l*aVl*_^zn~>-X6<HlQ<aG!PDL898%hZh-GDrTO?R^xa
z;i3*xa&RE0uTfGk6?Stj<XZwgWDbTYhEUJMXwbKwJrFr2@bxg|z&%xv3X=#iKU%+x
z$uNyZEKc1;1>FVVevF*R`w7kp#1y}Fu^rYXCUWp%E0~O@|E-Fga?h0Qp#Q*yWeqzg
z_X9%pTb+pi#{wWPcXL)&UIkQY1i~+WGl7-uqGKP)(mErRZiJC=1`6u|xky_T*RXQD
zddc|SQaBN3R7pWst|)S^*X*sbkrNrQ&%79<TUI!+;Ru!;N0!<~{fUxg#%JN2LUv9F
z!aO(cm#UQ_>t4;>rg0=67R#N!?Pr2t%L2=?BBv!Wqv6yCa+mx?hxvl`LBS_{WLwy?
z@UXqg*))5FeRJYHlwUb$!Zo%Udtd@l-pcD7>AnzR80L)66h_!e14opRvcrjEG@T%l
zNhFUEJw`LTmUo#CXx;5;OTLHpr)T0ak*GB%eQ2iQ6rb{Gbm0zn?h@ra&tVJ^u3y3^
zZc?ug?TBN{voKr-kwCHr;%9=0(AJ0q@q23~d4l%U#4V!WrzdMLE;V5Ek&2Hnu5kp+
zv7P5R7toDG`NKhpW%OgkgOi{Gl^}0noGx|3nLvui=nnuJsRNtjp_)8)%Iu@G-tV*1
zF`FDZLFZaxoY44nH5m8Fc)~-kq66#vW7!~rr*-eNQL`^c6Sz$rtwc0U;+m+Tk-QX1
zxJPeM?y3B~sN?vBGLr1L#4$?@-9xWV&@q?1N;vnU1JR*l^dtsk++-8L<+HO*?HzRD
zIYY6_<axmi*kfp3did`6w(I!fHGIv?k}o}cofz<tMyTK8A&mx*0$<@i@%jlF;RtB^
vfZkmu<>hyr_(>@<7ko7u3E5V2*@PKS>H!AX_fWo{AsmRd@uzVfpQHaDKnj}J

literal 0
HcmV?d00001

diff --git a/java/java-tests/testData/libResolve/methodHierarchy/MessageLite.class b/java/java-tests/testData/libResolve/methodHierarchy/MessageLite.class
new file mode 100644
index 0000000000000000000000000000000000000000..9d3fe70dda17829cff8d5819ef770f123890a843
GIT binary patch
literal 817
zcmah{T~8B16g?Me*Osa+h>9PegoG_5ZhS5wu_#HCnwl)}#iyZr-3;08G_$ip{b@e<
z1N>2jy9=$26nU7rx%ZxPKhDhWKR<r~c!xJ0UV3=tVbjAF!RzKaiP#bvy)<Qel&CD@
zOcLi-J3cXlJ-<IRqaZdWPB<7_<IHLPEjTg}M}ypra~C?xYSd|eA=E!!40-IdNiz?x
z39Xo2$X2UF|KKQ;i?HmsdxWNBJ}aBCJvR1aGM2=q-(J}23f3XiLLH~d<yOGm|AG(p
z7gqYjS*Bv{%W9oNDcEqPJ8>)v=rks5-%|50MmQ^1ocGqM38CV*zjg^5e*a8;SAjOc
z4NaP*lpi?JBk3Cznzm9tzgB*>{r)Y@=Vsoy<`h!M6w{}xhbFf}KGuoo(wxJ;EoLHY
zEqcE>n2^fh6P3on;Pi}#j^N)x8rWI?-8-Puu?cHak$QvKN2wABOLCUwgVrkY^>AOj
zns^nlb&0H?Ar9dI9!lhqWR}nrzlGH@zJ|x8^|1aA^U00KQ#>oN8-<lR&&&G-s$%QH
KE_&Xp)-C}wBHpe5

literal 0
HcmV?d00001

diff --git a/java/java-tests/testSrc/com/intellij/psi/resolve/ResolveInLibrariesTest.groovy b/java/java-tests/testSrc/com/intellij/psi/resolve/ResolveInLibrariesTest.groovy
index a0c761a12f89..82780383856c 100644
--- a/java/java-tests/testSrc/com/intellij/psi/resolve/ResolveInLibrariesTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/psi/resolve/ResolveInLibrariesTest.groovy
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 package com.intellij.psi.resolve
+
 import com.intellij.openapi.application.ex.PathManagerEx
+import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.vfs.JarFileSystem
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VirtualFile
@@ -217,4 +219,22 @@ class Testcase {
     myFixture.checkHighlighting()
   }
 
+  public void "test update method hierarchy on class file change"() {
+    myFixture.testDataPath = PathManagerEx.getTestDataPath() + "/libResolve/methodHierarchy"
+    myFixture.copyDirectoryToProject("", "lib")
+    PsiTestUtil.addLibrary(myModule, "lib", myFixture.tempDirFixture.getFile("").path, "lib");
+
+    def message = JavaPsiFacade.getInstance(project).findClass('com.google.protobuf.AbstractMessageLite',
+                                                               GlobalSearchScope.allScope(project))
+    assert message
+    def method = message.findMethodsByName("toByteArray", false)[0]
+    assert method
+    assert method.hierarchicalMethodSignature.superSignatures.size() == 1
+
+    WriteCommandAction.runWriteCommandAction(project) {
+      message.interfaces[0].containingFile.virtualFile.delete(this)
+    }
+    assert method.hierarchicalMethodSignature.superSignatures.size() == 0
+  }
+
 }
diff --git a/platform/core-api/src/com/intellij/psi/PsiInvalidElementAccessException.java b/platform/core-api/src/com/intellij/psi/PsiInvalidElementAccessException.java
index 9d737fc24345..c83865b8028c 100644
--- a/platform/core-api/src/com/intellij/psi/PsiInvalidElementAccessException.java
+++ b/platform/core-api/src/com/intellij/psi/PsiInvalidElementAccessException.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.stubs.PsiFileStubImpl;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.ExceptionUtil;
@@ -143,8 +144,13 @@ public class PsiInvalidElementAccessException extends RuntimeException implement
       String m = "parent is null";
       if (root instanceof StubBasedPsiElement) {
         StubElement stub = ((StubBasedPsiElement)root).getStub();
-        m += "; stub=" + stub;
-        if (stub != null) m += "; p.s.=" + stub.getParentStub();
+        while (stub != null) {
+          m += "\n  each stub=" + stub;
+          if (stub instanceof PsiFileStubImpl) {
+            m += "; fileStub.psi=" + stub.getPsi() + "; reason=" + ((PsiFileStubImpl)stub).getInvalidationReason();
+          }
+          stub = stub.getParentStub();
+        }
       }
       return m;
     }