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

Refactoring: rename KotlinLightMethodFromTrait -> KotlinLightMethodForTraitFakeOverride

Browse Source
This commit is contained in:
Nikolay Krasko
2014-10-01 12:38:21 +04:00
parent 5c6d74af7d
commit bc5f28d9fd
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodFromTrait.kt → compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightMethodForTraitFakeOverride.kt
+6 -6
View File
@@ -20,17 +20,17 @@ import com.intellij.psi.PsiManager
import com.intellij.psi.PsiMethod import com.intellij.psi.PsiMethod
import org.jetbrains.jet.lang.psi.JetDeclaration import org.jetbrains.jet.lang.psi.JetDeclaration
import com.intellij.psi.PsiClass import com.intellij.psi.PsiClass
import org.jetbrains.jet.asJava.KotlinLightMethodFromTrait import org.jetbrains.jet.asJava.KotlinLightMethodForTraitFakeOverride
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
public class KotlinLightMethodFromTrait(manager: PsiManager, public class KotlinLightMethodForTraitFakeOverride(manager: PsiManager,
override val delegate: PsiMethod, override val delegate: PsiMethod,
override val origin: JetDeclaration, override val origin: JetDeclaration,
containingClass: PsiClass) : containingClass: PsiClass) :
KotlinLightMethodForDeclaration(manager, delegate, origin, containingClass) { KotlinLightMethodForDeclaration(manager, delegate, origin, containingClass) {
override fun copy(): PsiElement { override fun copy(): PsiElement {
return KotlinLightMethodFromTrait(getManager()!!, delegate, origin.copy() as JetDeclaration, getContainingClass()!!) return KotlinLightMethodForTraitFakeOverride(getManager()!!, delegate, origin.copy() as JetDeclaration, getContainingClass()!!)
} }
} }
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
+3 -3
View File
@@ -134,9 +134,9 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
JetDeclaration declaration = ClsWrapperStubPsiFactory.getOriginalDeclaration(method); JetDeclaration declaration = ClsWrapperStubPsiFactory.getOriginalDeclaration(method);
if (declaration != null) { if (declaration != null) {
return !isMethodFromTrait(declaration) ? return !isTraitFakeOverride(declaration) ?
new KotlinLightMethodForDeclaration(myManager, method, declaration, KotlinWrappingLightClass.this) : new KotlinLightMethodForDeclaration(myManager, method, declaration, KotlinWrappingLightClass.this) :
new KotlinLightMethodFromTrait(myManager, method, declaration, KotlinWrappingLightClass.this); new KotlinLightMethodForTraitFakeOverride(myManager, method, declaration, KotlinWrappingLightClass.this);
} }
return new LightMethod(myManager, method, KotlinWrappingLightClass.this); return new LightMethod(myManager, method, KotlinWrappingLightClass.this);
@@ -161,7 +161,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
return origin == null ? null : origin.getText(); return origin == null ? null : origin.getText();
} }
private boolean isMethodFromTrait(@NotNull JetDeclaration originMethodDeclaration) { private boolean isTraitFakeOverride(@NotNull JetDeclaration originMethodDeclaration) {
if (!(originMethodDeclaration instanceof JetNamedFunction || if (!(originMethodDeclaration instanceof JetNamedFunction ||
originMethodDeclaration instanceof JetPropertyAccessor || originMethodDeclaration instanceof JetPropertyAccessor ||
originMethodDeclaration instanceof JetProperty)) { originMethodDeclaration instanceof JetProperty)) {
idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenFunctionMarker.kt
+4 -4
View File
@@ -41,7 +41,7 @@ import com.intellij.psi.search.searches.AllOverridingMethodsSearch
import com.intellij.openapi.util.Pair import com.intellij.openapi.util.Pair
import java.util.HashSet import java.util.HashSet
import com.intellij.util.Processor import com.intellij.util.Processor
import org.jetbrains.jet.asJava.KotlinLightMethodFromTrait import org.jetbrains.jet.asJava.KotlinLightMethodForTraitFakeOverride
private fun <T> getOverriddenDeclarations(mappingToJava: MutableMap<PsiMethod, T>, classes: Set<PsiClass>): Set<T> { private fun <T> getOverriddenDeclarations(mappingToJava: MutableMap<PsiMethod, T>, classes: Set<PsiClass>): Set<T> {
val overridden = HashSet<T>() val overridden = HashSet<T>()
@@ -50,7 +50,7 @@ private fun <T> getOverriddenDeclarations(mappingToJava: MutableMap<PsiMethod, T
override fun process(pair: Pair<PsiMethod, PsiMethod>?): Boolean { override fun process(pair: Pair<PsiMethod, PsiMethod>?): Boolean {
ProgressManager.checkCanceled() ProgressManager.checkCanceled()
if (pair!!.getSecond() !is KotlinLightMethodFromTrait) { if (pair!!.getSecond() !is KotlinLightMethodForTraitFakeOverride) {
val superMethod = pair.getFirst() val superMethod = pair.getFirst()
val declaration = mappingToJava.get(superMethod) val declaration = mappingToJava.get(superMethod)
@@ -80,7 +80,7 @@ public fun getOverriddenMethodTooltip(method: PsiMethod): String? {
val comparator = MethodCellRenderer(false).getComparator() val comparator = MethodCellRenderer(false).getComparator()
val overridingJavaMethods = processor.getCollection().filter { it !is KotlinLightMethodFromTrait } sortBy(comparator) val overridingJavaMethods = processor.getCollection().filter { it !is KotlinLightMethodForTraitFakeOverride } sortBy(comparator)
if (overridingJavaMethods.isEmpty()) return null if (overridingJavaMethods.isEmpty()) return null
val start = if (isAbstract) DaemonBundle.message("method.is.implemented.header") else DaemonBundle.message("method.is.overriden.header") val start = if (isAbstract) DaemonBundle.message("method.is.implemented.header") else DaemonBundle.message("method.is.overriden.header")
@@ -103,7 +103,7 @@ public fun navigateToOverriddenMethod(e: MouseEvent?, method: PsiMethod) {
return return
} }
var overridingJavaMethods = processor.getCollection().filter { it !is KotlinLightMethodFromTrait } var overridingJavaMethods = processor.getCollection().filter { it !is KotlinLightMethodForTraitFakeOverride }
if (overridingJavaMethods.isEmpty()) return if (overridingJavaMethods.isEmpty()) return
val showMethodNames = !PsiUtil.allMethodsHaveSameSignature(overridingJavaMethods.copyToArray()) val showMethodNames = !PsiUtil.allMethodsHaveSameSignature(overridingJavaMethods.copyToArray())