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

Don't create PsiMethod wrapper when it's not necessary

Browse Source
This commit is contained in:
Alexey Sedunov
2013-12-20 15:33:05 +04:00
parent fffddc3e87
commit 34e80056eb
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
+10 -3
View File
@@ -111,13 +111,13 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
if (declaration instanceof JetNamedFunction) { if (declaration instanceof JetNamedFunction) {
JetNamedFunction function = (JetNamedFunction) declaration; JetNamedFunction function = (JetNamedFunction) declaration;
return getParentByPsiMethod(LightClassUtil.getLightClassMethod(function), function.getName()); return getParentByPsiMethod(LightClassUtil.getLightClassMethod(function), function.getName(), false);
} }
// Represent the property as a fake method with the same name // Represent the property as a fake method with the same name
if (declaration instanceof JetProperty) { if (declaration instanceof JetProperty) {
JetProperty property = (JetProperty) declaration; JetProperty property = (JetProperty) declaration;
return getParentByPsiMethod(LightClassUtil.getLightClassPropertyMethods(property).getGetter(), property.getName()); return getParentByPsiMethod(LightClassUtil.getLightClassPropertyMethods(property).getGetter(), property.getName(), true);
} }
if (declaration instanceof JetClassInitializer) { if (declaration instanceof JetClassInitializer) {
@@ -133,7 +133,7 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
return classOrObject.getParent() == classOrObject.getContainingFile() ? getContainingFile() : getContainingClass(); return classOrObject.getParent() == classOrObject.getContainingFile() ? getContainingFile() : getContainingClass();
} }
private PsiElement getParentByPsiMethod(PsiMethod method, final String name) { private PsiElement getParentByPsiMethod(PsiMethod method, final String name, boolean forceMethodWrapping) {
if (method == null || name == null) return null; if (method == null || name == null) return null;
PsiClass containingClass = method.getContainingClass(); PsiClass containingClass = method.getContainingClass();
@@ -141,6 +141,8 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
final String currentFileName = classOrObject.getContainingFile().getName(); final String currentFileName = classOrObject.getContainingFile().getName();
boolean createWrapper = forceMethodWrapping;
// Use PsiClass wrapper instead of package light class to avoid names like "FooPackage" in Type Hierarchy and related views
if (containingClass instanceof KotlinLightClassForPackage) { if (containingClass instanceof KotlinLightClassForPackage) {
containingClass = new LightClass(containingClass, JetLanguage.INSTANCE) { containingClass = new LightClass(containingClass, JetLanguage.INSTANCE) {
@Nullable @Nullable
@@ -149,8 +151,10 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
return currentFileName; return currentFileName;
} }
}; };
createWrapper = true;
} }
if (createWrapper) {
return new LightMethod(myManager, method, containingClass, JetLanguage.INSTANCE) { return new LightMethod(myManager, method, containingClass, JetLanguage.INSTANCE) {
@Override @Override
public PsiElement getParent() { public PsiElement getParent() {
@@ -164,6 +168,9 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
} }
}; };
} }
return method;
}
}; };
@Nullable @Nullable