From 0047c3f966e12e57e6d61c964b820466ea616a07 Mon Sep 17 00:00:00 2001 From: Peter Gromov Date: Mon, 28 Sep 2009 18:12:45 +0400 Subject: [PATCH] fix SOE --- .../intellij/psi/impl/PsiClassImplUtil.java | 29 +------------------ 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java b/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java index 4ad1dbac6ccb..4c5d37573141 100644 --- a/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java @@ -1,13 +1,10 @@ package com.intellij.psi.impl; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.roots.ProjectFileIndex; -import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.Iconable; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.UserDataHolderEx; -import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.filters.OrFilter; import com.intellij.psi.impl.source.PsiImmediateClassType; @@ -829,31 +826,7 @@ public class PsiClassImplUtil { return false; } } - if (qName1.hashCode() != qName2.hashCode() || !qName1.equals(qName2)) { - return false; - } - - final PsiElement mirror1 = aClass instanceof PsiCompiledElement ? ((PsiCompiledElement)aClass).getMirror() : aClass; - final PsiElement mirror2 = another instanceof PsiCompiledElement ? ((PsiCompiledElement)another).getMirror() : another; - if (mirror1.equals(mirror2)) { - return true; - } - - final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(aClass.getProject()).getFileIndex(); - final PsiFile file1 = aClass.getContainingFile().getOriginalFile(); - final PsiFile file2 = another.getContainingFile().getOriginalFile(); - if (file1.equals(file2)) { - return true; - } - - final VirtualFile vfile1 = file1.getViewProvider().getVirtualFile(); - final VirtualFile vfile2 = file2.getViewProvider().getVirtualFile(); - if ((fileIndex.isInSource(vfile1) || fileIndex.isInLibraryClasses(vfile1)) && - (fileIndex.isInSource(vfile2) || fileIndex.isInLibraryClasses(vfile2))) { - return true; - } - - return false; + return qName1.hashCode() == qName2.hashCode() && qName1.equals(qName2); } public static boolean isFieldEquivalentTo(PsiField field, PsiElement another) {