azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed checking for DELEGATE_KEY in ClsClassImpl, since alt-headers are not loaded anymore.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-07-07 23:42:19 +04:00
parent b26dd5d7c3
commit ae92d435d6
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java
-9
View File
@@ -106,15 +106,6 @@ public class JetQuickDocumentationProvider extends AbstractDocumentationProvider
if (JetLanguage.INSTANCE == declaration.getLanguage()) return true; if (JetLanguage.INSTANCE == declaration.getLanguage()) return true;
ClsClassImpl clsClass = PsiTreeUtil.getParentOfType(declaration, ClsClassImpl.class); ClsClassImpl clsClass = PsiTreeUtil.getParentOfType(declaration, ClsClassImpl.class);
if (clsClass == null) return false; 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()); return JetDecompiledData.isKotlinFile((ClsFileImpl) clsClass.getContainingFile());
} }
} }
idea/src/org/jetbrains/jet/plugin/libraries/JetClsNavigationPolicy.java
-9
View File
@@ -31,9 +31,6 @@ public class JetClsNavigationPolicy implements ClsCustomNavigationPolicy {
@Override @Override
@Nullable @Nullable
public PsiElement getNavigationElement(@NotNull ClsClassImpl clsClass) { public PsiElement getNavigationElement(@NotNull ClsClassImpl clsClass) {
if (clsClass.getUserData(ClsClassImpl.DELEGATE_KEY) != null) {
return null;
}
JetClass jetClass = (JetClass) getJetDeclarationByClsElement(clsClass); JetClass jetClass = (JetClass) getJetDeclarationByClsElement(clsClass);
if (jetClass != null) { if (jetClass != null) {
JetClassOrObject sourceClass = JetSourceNavigationHelper.getSourceClass(jetClass); JetClassOrObject sourceClass = JetSourceNavigationHelper.getSourceClass(jetClass);
@@ -47,9 +44,6 @@ public class JetClsNavigationPolicy implements ClsCustomNavigationPolicy {
@Override @Override
@Nullable @Nullable
public PsiElement getNavigationElement(@NotNull ClsMethodImpl clsMethod) { public PsiElement getNavigationElement(@NotNull ClsMethodImpl clsMethod) {
if (clsMethod.getParent().getUserData(ClsClassImpl.DELEGATE_KEY) != null) {
return null;
}
JetDeclaration jetDeclaration = getJetDeclarationByClsElement(clsMethod); JetDeclaration jetDeclaration = getJetDeclarationByClsElement(clsMethod);
if (jetDeclaration instanceof JetProperty) { if (jetDeclaration instanceof JetProperty) {
JetDeclaration sourceProperty = JetSourceNavigationHelper.getSourceProperty((JetProperty) jetDeclaration); JetDeclaration sourceProperty = JetSourceNavigationHelper.getSourceProperty((JetProperty) jetDeclaration);
@@ -69,9 +63,6 @@ public class JetClsNavigationPolicy implements ClsCustomNavigationPolicy {
@Override @Override
@Nullable @Nullable
public PsiElement getNavigationElement(@NotNull ClsFieldImpl clsField) { public PsiElement getNavigationElement(@NotNull ClsFieldImpl clsField) {
if (clsField.getParent().getUserData(ClsClassImpl.DELEGATE_KEY) != null) {
return null;
}
return getJetDeclarationByClsElement(clsField); return getJetDeclarationByClsElement(clsField);
} }