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

Minor: move some code to super class in Kotlin light classes

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-12-17 16:39:05 +03:00
parent eb1feeb480
commit ec4f506f8f
3 changed files with 12 additions and 15 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
+1 -6
View File
@@ -195,7 +195,7 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
@NotNull FqName name, @NotNull FqName name,
@NotNull JetClassOrObject classOrObject @NotNull JetClassOrObject classOrObject
) { ) {
super(manager, JetLanguage.INSTANCE); super(manager);
this.classFqName = name; this.classFqName = name;
this.classOrObject = classOrObject; this.classOrObject = classOrObject;
} }
@@ -340,11 +340,6 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
return another instanceof PsiClass && Comparing.equal(((PsiClass) another).getQualifiedName(), getQualifiedName()); return another instanceof PsiClass && Comparing.equal(((PsiClass) another).getQualifiedName(), getQualifiedName());
} }
@Override
public ItemPresentation getPresentation() {
return ItemPresentationProviders.getItemPresentation(this);
}
@Override @Override
public Icon getElementIcon(int flags) { public Icon getElementIcon(int flags) {
throw new UnsupportedOperationException("This should be done byt JetIconProvider"); throw new UnsupportedOperationException("This should be done byt JetIconProvider");
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
+1 -6
View File
@@ -147,7 +147,7 @@ public class KotlinLightClassForPackage extends KotlinWrappingLightClass impleme
@NotNull GlobalSearchScope searchScope, @NotNull GlobalSearchScope searchScope,
@NotNull Collection<JetFile> files @NotNull Collection<JetFile> files
) { ) {
super(manager, JetLanguage.INSTANCE); super(manager);
this.modifierList = new LightModifierList(manager, JetLanguage.INSTANCE, PsiModifier.PUBLIC, PsiModifier.FINAL); this.modifierList = new LightModifierList(manager, JetLanguage.INSTANCE, PsiModifier.PUBLIC, PsiModifier.FINAL);
this.implementsList = new LightEmptyImplementsList(manager); this.implementsList = new LightEmptyImplementsList(manager);
this.packageFqName = packageFqName; this.packageFqName = packageFqName;
@@ -377,11 +377,6 @@ public class KotlinLightClassForPackage extends KotlinWrappingLightClass impleme
return another instanceof PsiClass && Comparing.equal(((PsiClass) another).getQualifiedName(), getQualifiedName()); return another instanceof PsiClass && Comparing.equal(((PsiClass) another).getQualifiedName(), getQualifiedName());
} }
@Override
public ItemPresentation getPresentation() {
return ItemPresentationProviders.getItemPresentation(this);
}
@Override @Override
public Icon getElementIcon(int flags) { public Icon getElementIcon(int flags) {
throw new UnsupportedOperationException("This should be done byt JetIconProvider"); throw new UnsupportedOperationException("This should be done byt JetIconProvider");
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
+10 -3
View File
@@ -17,6 +17,8 @@
package org.jetbrains.jet.asJava; package org.jetbrains.jet.asJava;
import com.intellij.lang.Language; import com.intellij.lang.Language;
import com.intellij.navigation.ItemPresentation;
import com.intellij.navigation.ItemPresentationProviders;
import com.intellij.psi.*; import com.intellij.psi.*;
import com.intellij.psi.impl.PsiClassImplUtil; import com.intellij.psi.impl.PsiClassImplUtil;
import com.intellij.psi.impl.light.AbstractLightClass; import com.intellij.psi.impl.light.AbstractLightClass;
@@ -24,8 +26,8 @@ import com.intellij.psi.impl.light.LightField;
import com.intellij.psi.impl.light.LightMethod; import com.intellij.psi.impl.light.LightMethod;
import com.intellij.psi.impl.source.ClassInnerStuffCache; import com.intellij.psi.impl.source.ClassInnerStuffCache;
import com.intellij.psi.impl.source.PsiExtensibleClass; import com.intellij.psi.impl.source.PsiExtensibleClass;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.scope.PsiScopeProcessor; import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Function; import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import kotlin.Function1; import kotlin.Function1;
@@ -40,8 +42,8 @@ import java.util.List;
public abstract class KotlinWrappingLightClass extends AbstractLightClass implements KotlinLightClass, PsiExtensibleClass { public abstract class KotlinWrappingLightClass extends AbstractLightClass implements KotlinLightClass, PsiExtensibleClass {
private final ClassInnerStuffCache myInnersCache = new ClassInnerStuffCache(this); private final ClassInnerStuffCache myInnersCache = new ClassInnerStuffCache(this);
protected KotlinWrappingLightClass(PsiManager manager, Language language) { protected KotlinWrappingLightClass(PsiManager manager) {
super(manager, language); super(manager, JetLanguage.INSTANCE);
} }
@NotNull @NotNull
@@ -191,4 +193,9 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
// Method was generated from declaration in some other trait // Method was generated from declaration in some other trait
return (parentOfMethodOrigin != null && thisClassDeclaration != parentOfMethodOrigin && JetPsiUtil.isTrait(parentOfMethodOrigin)); return (parentOfMethodOrigin != null && thisClassDeclaration != parentOfMethodOrigin && JetPsiUtil.isTrait(parentOfMethodOrigin));
} }
@Override
public ItemPresentation getPresentation() {
return ItemPresentationProviders.getItemPresentation(this);
}
} }