From bc2af62065388a544039b9b383d9aa8ecfcec5f6 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 11 Feb 2014 17:18:37 +0100 Subject: [PATCH] faster getOriginalElement for source methods --- .../src/com/intellij/psi/impl/source/PsiMethodImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java index 456398fc2cd3..b8ef7d307b43 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java @@ -325,9 +325,12 @@ public class PsiMethodImpl extends JavaStubPsiElement implements public PsiElement getOriginalElement() { final PsiClass containingClass = getContainingClass(); if (containingClass != null) { - final PsiMethod originalMethod = ((PsiClass)containingClass.getOriginalElement()).findMethodBySignature(this, false); - if (originalMethod != null) { - return originalMethod; + PsiElement original = containingClass.getOriginalElement(); + if (original != containingClass) { + final PsiMethod originalMethod = ((PsiClass)original).findMethodBySignature(this, false); + if (originalMethod != null) { + return originalMethod; + } } } return this;