From ae92d435d6ccfa37e55bdb6668ed5f3f9a6f04fd Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Sat, 7 Jul 2012 23:42:19 +0400 Subject: [PATCH] Removed checking for DELEGATE_KEY in ClsClassImpl, since alt-headers are not loaded anymore. --- .../jet/plugin/JetQuickDocumentationProvider.java | 9 --------- .../jet/plugin/libraries/JetClsNavigationPolicy.java | 9 --------- 2 files changed, 18 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index 33073a31b28..9889353ee93 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -106,15 +106,6 @@ public class JetQuickDocumentationProvider extends AbstractDocumentationProvider if (JetLanguage.INSTANCE == declaration.getLanguage()) return true; ClsClassImpl clsClass = PsiTreeUtil.getParentOfType(declaration, ClsClassImpl.class); if (clsClass == null) return false; - PsiClass delegate = clsClass.getUserData(ClsClassImpl.DELEGATE_KEY); - if (delegate != null) { - if (delegate instanceof ClsClassImpl) { - clsClass = (ClsClassImpl) delegate; - } - else { - return false; - } - } return JetDecompiledData.isKotlinFile((ClsFileImpl) clsClass.getContainingFile()); } } diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetClsNavigationPolicy.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetClsNavigationPolicy.java index 4c1b3181fa7..037ab9d6b94 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetClsNavigationPolicy.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetClsNavigationPolicy.java @@ -31,9 +31,6 @@ public class JetClsNavigationPolicy implements ClsCustomNavigationPolicy { @Override @Nullable public PsiElement getNavigationElement(@NotNull ClsClassImpl clsClass) { - if (clsClass.getUserData(ClsClassImpl.DELEGATE_KEY) != null) { - return null; - } JetClass jetClass = (JetClass) getJetDeclarationByClsElement(clsClass); if (jetClass != null) { JetClassOrObject sourceClass = JetSourceNavigationHelper.getSourceClass(jetClass); @@ -47,9 +44,6 @@ public class JetClsNavigationPolicy implements ClsCustomNavigationPolicy { @Override @Nullable public PsiElement getNavigationElement(@NotNull ClsMethodImpl clsMethod) { - if (clsMethod.getParent().getUserData(ClsClassImpl.DELEGATE_KEY) != null) { - return null; - } JetDeclaration jetDeclaration = getJetDeclarationByClsElement(clsMethod); if (jetDeclaration instanceof JetProperty) { JetDeclaration sourceProperty = JetSourceNavigationHelper.getSourceProperty((JetProperty) jetDeclaration); @@ -69,9 +63,6 @@ public class JetClsNavigationPolicy implements ClsCustomNavigationPolicy { @Override @Nullable public PsiElement getNavigationElement(@NotNull ClsFieldImpl clsField) { - if (clsField.getParent().getUserData(ClsClassImpl.DELEGATE_KEY) != null) { - return null; - } return getJetDeclarationByClsElement(clsField); }