From c5be8ce1d3f4342fc33c7f6e410adf6f60484065 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 2 Feb 2016 17:26:23 +0300 Subject: [PATCH] Prevent recursion when computing parameter list of KtLightMethod #KT-10890 Fixed #KT-10851 Fixed --- .../kotlin/asJava/ClsWrapperStubPsiFactory.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java index 09770c62217..1ba10e255f5 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java @@ -51,13 +51,19 @@ class ClsWrapperStubPsiFactory extends StubPsiFactory { @Override public PsiClass createClass(@NotNull PsiClassStub stub) { final PsiElement origin = getOriginalElement(stub); - if (origin == null) return delegate.createClass(stub); - return new ClsClassImpl(stub) { @NotNull @Override public PsiElement getNavigationElement() { - return origin; + if (origin != null) return origin; + + return super.getNavigationElement(); + } + + @Nullable + @Override + public PsiClass getSourceMirrorClass() { + return null; } }; }