diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/JetClsMethod.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightMethod.java similarity index 85% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/JetClsMethod.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightMethod.java index 0df82b5c07d..c29f2725134 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/JetClsMethod.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/KotlinLightMethod.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.java.jetAsJava; import com.intellij.psi.PsiMethod; import org.jetbrains.jet.lang.psi.JetDeclaration; -/** ClsMethod created for Kotlin declaration for it to be resolved from Java */ -public interface JetClsMethod extends PsiMethod { +/** Java method created for Kotlin declaration to make it resolvable in Java */ +public interface KotlinLightMethod extends PsiMethod { JetDeclaration getOrigin(); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java index 1c9abc01e99..fcaffc0ca5e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod; +import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod; import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap; import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage; @@ -238,8 +238,8 @@ public class SignaturesPropagationData { continue; } - DeclarationDescriptor superFun = superMethod.getPsi() instanceof JetClsMethod - ? trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, ((JetClsMethod) superMethod.getPsi()).getOrigin()) + DeclarationDescriptor superFun = superMethod.getPsi() instanceof KotlinLightMethod + ? trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, ((KotlinLightMethod) superMethod.getPsi()).getOrigin()) : findSuperFunction(superclassToFunctions.get(classFqName), superMethod); if (superFun == null) { // Super methods which are Object methods in interfaces are not loaded by JDR. diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java index c290195a95b..2b947aeed31 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java @@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod; +import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.utils.ExceptionUtils; @@ -177,7 +177,7 @@ public class LightClassUtil { List methods = new SmartList(); for (PsiMethod method : psiClass.getMethods()) { try { - if (method instanceof JetClsMethod && ((JetClsMethod) method).getOrigin() == declaration) { + if (method instanceof KotlinLightMethod && ((KotlinLightMethod) method).getOrigin() == declaration) { methods.add(method); if (!collectAll) { return methods; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java index e4a3e3f710d..19b5a99b3ce 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java @@ -27,7 +27,7 @@ import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod; +import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; import java.util.ArrayList; @@ -110,8 +110,8 @@ public class KotlinCalleeMethodsTreeStructure extends KotlinCallTreeStructure { } // Kotlin function or property invoked from Java code - if (targetElement instanceof JetClsMethod) { - return buildChildrenByKotlinTarget(descriptor, ((JetClsMethod) targetElement).getOrigin()); + if (targetElement instanceof KotlinLightMethod) { + return buildChildrenByKotlinTarget(descriptor, ((KotlinLightMethod) targetElement).getOrigin()); } if (targetElement instanceof JetElement) { diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java index 9b5d993dfa1..b089daabd9e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod; +import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.NamespaceType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; @@ -116,7 +116,7 @@ public class JetRefactoringUtil { } private static PsiElement toJetDeclarationOrMethod(PsiMethod method) { - return (method instanceof JetClsMethod) ? ((JetClsMethod) method).getOrigin() : method; + return (method instanceof KotlinLightMethod) ? ((KotlinLightMethod) method).getOrigin() : method; } @NotNull @@ -311,8 +311,8 @@ public class JetRefactoringUtil { @NotNull public static String formatJavaOrLightMethod(@NotNull PsiMethod method) { - if (method instanceof JetClsMethod) { - JetDeclaration declaration = ((JetClsMethod) method).getOrigin(); + if (method instanceof KotlinLightMethod) { + JetDeclaration declaration = ((KotlinLightMethod) method).getOrigin(); BindingContext bindingContext = AnalyzerFacadeWithCache.analyzeFileWithCache((JetFile) declaration.getContainingFile()).getBindingContext(); DeclarationDescriptor descriptor = diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.java index 7c59ca8bd7a..4c8c8d97254 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.java @@ -31,8 +31,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod; +import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil; import org.jetbrains.jet.renderer.DescriptorRenderer; @@ -126,13 +125,13 @@ public final class JetChangeSignatureData implements JetMethodDescriptor { List jetLightMethods = ContainerUtil.filter(overridingMethods, new Condition() { @Override public boolean value(PsiMethod method) { - return method instanceof JetClsMethod; + return method instanceof KotlinLightMethod; } }); List jetFunctions = ContainerUtil.map(jetLightMethods, new Function() { @Override public JetDeclaration fun(PsiMethod method) { - return ((JetClsMethod) method).getOrigin(); + return ((KotlinLightMethod) method).getOrigin(); } }); result.addAll(jetFunctions); diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.java b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.java index ba164dbaa92..08fbb6c354d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.java @@ -47,7 +47,7 @@ import org.jetbrains.jet.lang.descriptors.Modality; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod; +import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod; import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; @@ -158,8 +158,8 @@ public class KotlinSafeDeleteProcessor extends JavaSafeDeleteProcessor { @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass") public static boolean isInside(@NotNull PsiElement place, @NotNull PsiElement ancestor) { - if (ancestor instanceof JetClsMethod) { - ancestor = ((JetClsMethod) ancestor).getOrigin(); + if (ancestor instanceof KotlinLightMethod) { + ancestor = ((KotlinLightMethod) ancestor).getOrigin(); } return JavaSafeDeleteProcessor.isInside(place, ancestor); } @@ -319,7 +319,8 @@ public class KotlinSafeDeleteProcessor extends JavaSafeDeleteProcessor { for (PsiMethod overridingMethod : overridingMethods) { Collection overridingReferences = ReferencesSearch.search( - overridingMethod instanceof JetClsMethod ? ((JetClsMethod) overridingMethod).getOrigin() : overridingMethod + overridingMethod instanceof KotlinLightMethod + ? ((KotlinLightMethod) overridingMethod).getOrigin() : overridingMethod ).findAll(); methodToReferences.put(overridingMethod, overridingReferences); } @@ -585,7 +586,8 @@ public class KotlinSafeDeleteProcessor extends JavaSafeDeleteProcessor { ) { PsiMethod[] methods = method.findSuperMethods(); for (PsiMethod superMethod : methods) { - PsiElement relevantElement = superMethod instanceof JetClsMethod ? ((JetClsMethod) superMethod).getOrigin() : superMethod; + PsiElement relevantElement = superMethod instanceof KotlinLightMethod + ? ((KotlinLightMethod) superMethod).getOrigin() : superMethod; relevantElement = JetPsiUtil.ascendIfPropertyAccessor(relevantElement); if (ArrayUtilRt.find(ignore, relevantElement) < 0 && !MethodSignatureUtil.isSuperMethod(originalMethod, superMethod)) { return true; @@ -745,8 +747,8 @@ public class KotlinSafeDeleteProcessor extends JavaSafeDeleteProcessor { } private static boolean checkPsiMethodEquality(@NotNull PsiMethod method1, @NotNull PsiMethod method2) { - if (method1 instanceof JetClsMethod && method2 instanceof JetClsMethod) { - return ((JetClsMethod) method1).getOrigin().equals(((JetClsMethod) method2).getOrigin()); + if (method1 instanceof KotlinLightMethod && method2 instanceof KotlinLightMethod) { + return ((KotlinLightMethod) method1).getOrigin().equals(((KotlinLightMethod) method2).getOrigin()); } return method1.equals(method2); } @@ -756,8 +758,8 @@ public class KotlinSafeDeleteProcessor extends JavaSafeDeleteProcessor { Collection overridingMethods = OverridingMethodsSearch.search(method, true).findAll(); overrideLoop: for (PsiMethod overridingMethod : overridingMethods) { - PsiElement overridingElement = overridingMethod instanceof JetClsMethod - ? ((JetClsMethod) overridingMethod).getOrigin() + PsiElement overridingElement = overridingMethod instanceof KotlinLightMethod + ? ((KotlinLightMethod) overridingMethod).getOrigin() : overridingMethod; Collection currentSuperMethods = new ArrayList(); @@ -854,8 +856,8 @@ public class KotlinSafeDeleteProcessor extends JavaSafeDeleteProcessor { } private static void addParameter(@NotNull PsiMethod method, @NotNull Set result, int parameterIndex) { - if (method instanceof JetClsMethod) { - JetDeclaration declaration = ((JetClsMethod) method).getOrigin(); + if (method instanceof KotlinLightMethod) { + JetDeclaration declaration = ((KotlinLightMethod) method).getOrigin(); if (declaration instanceof JetNamedFunction) { result.add(((JetNamedFunction) declaration).getValueParameters().get(parameterIndex)); } diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java index 8a26c2d99cc..c34a3ecada3 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java +++ b/idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod; +import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod; import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache; import java.util.ArrayList; @@ -88,7 +88,7 @@ public abstract class JetPsiReference implements PsiPolyVariantReference { @Override public boolean isReferenceTo(PsiElement element) { PsiElement target = resolve(); - PsiElement mirrorElement = element instanceof JetClsMethod ? ((JetClsMethod) element).getOrigin() : null; + PsiElement mirrorElement = element instanceof KotlinLightMethod ? ((KotlinLightMethod) element).getOrigin() : null; return target == element || (mirrorElement != null && target == mirrorElement) || (target != null && target.getNavigationElement() == element); } diff --git a/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java index 22a4b888758..6ae7b5dd1c2 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java @@ -31,7 +31,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod; +import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod; public class KotlinDefinitionsSearcher implements QueryExecutor { @Override @@ -116,7 +116,8 @@ public class KotlinDefinitionsSearcher implements QueryExecutor origin.getParentByType(javaClass())