diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java similarity index 99% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java index f55de9d8adb..a1ab9bb6384 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java @@ -35,8 +35,8 @@ import java.util.*; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_CLASS; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KOTLIN_PACKAGE; -public class JavaResolverPsiUtils { - private JavaResolverPsiUtils() { +public class JavaResolverUtils { + private JavaResolverUtils() { } public static boolean isCompiledKotlinClass(@NotNull PsiClass psiClass) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java index 7b7fbbb1217..03a69a65ab8 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.java.JavaPackage; -import org.jetbrains.jet.lang.resolve.java.JavaResolverPsiUtils; +import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; import org.jetbrains.jet.lang.resolve.java.resolver.ExternalAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.structure.JavaMember; import org.jetbrains.jet.lang.resolve.name.Name; @@ -80,7 +80,7 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD setAnnotated(true); altFunDeclaration = JetPsiFactory(project).createFunction(signature); - originalToAltTypeParameters = JavaResolverPsiUtils.recreateTypeParametersAndReturnMapping(methodTypeParameters, null); + originalToAltTypeParameters = JavaResolverUtils.recreateTypeParametersAndReturnMapping(methodTypeParameters, null); try { checkForSyntaxErrors(altFunDeclaration); @@ -121,7 +121,7 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD @Nullable JetType returnType ) { if (JavaPackage.getPLATFORM_TYPES()) return; - TypeSubstitutor substitutor = JavaResolverPsiUtils.createSubstitutorForTypeParameters(originalToAltTypeParameters); + TypeSubstitutor substitutor = JavaResolverUtils.createSubstitutorForTypeParameters(originalToAltTypeParameters); for (ValueParameterDescriptor parameter : valueParameters) { int index = parameter.getIndex(); 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 cc66629c713..b0d7f65b229 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 @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JavaPackage; -import org.jetbrains.jet.lang.resolve.java.JavaResolverPsiUtils; +import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaMethodDescriptor; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmSignaturePackage; @@ -84,7 +84,7 @@ public class SignaturesPropagationData { superFunctions = getSuperFunctionsForMethod(method, autoMethodDescriptor, containingClass); - autoTypeParameterToModified = JavaResolverPsiUtils.recreateTypeParametersAndReturnMapping(autoTypeParameters, null); + autoTypeParameterToModified = JavaResolverUtils.recreateTypeParametersAndReturnMapping(autoTypeParameters, null); modifiedTypeParameters = modifyTypeParametersAccordingToSuperMethods(autoTypeParameters); modifiedReturnType = modifyReturnTypeAccordingToSuperMethods(autoReturnType); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java index 0557f5ce5dc..67c702eafc1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.java.JavaPackage; -import org.jetbrains.jet.lang.resolve.java.JavaResolverPsiUtils; +import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; import org.jetbrains.jet.lang.resolve.java.descriptor.*; import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver; import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; @@ -274,8 +274,8 @@ public class SingleAbstractMethodUtils { @Nullable DeclarationDescriptor newOwner ) { Map traitToFunTypeParameters = - JavaResolverPsiUtils.recreateTypeParametersAndReturnMapping(originalParameters, newOwner); - TypeSubstitutor typeParametersSubstitutor = JavaResolverPsiUtils.createSubstitutorForTypeParameters(traitToFunTypeParameters); + JavaResolverUtils.recreateTypeParametersAndReturnMapping(originalParameters, newOwner); + TypeSubstitutor typeParametersSubstitutor = JavaResolverUtils.createSubstitutorForTypeParameters(traitToFunTypeParameters); for (Map.Entry mapEntry : traitToFunTypeParameters.entrySet()) { TypeParameterDescriptor traitTypeParameter = mapEntry.getKey(); TypeParameterDescriptorImpl funTypeParameter = mapEntry.getValue(); @@ -405,8 +405,8 @@ public class SingleAbstractMethodUtils { JavaValueParameter param2 = it2.next(); if (param1.isVararg() != param2.isVararg()) return false; - JavaType type1 = JavaResolverPsiUtils.erasure(substitutor1.substitute(param1.getType()), substitutor1); - JavaType type2 = JavaResolverPsiUtils.erasure(substitutor2.substitute(param2.getType()), substitutor2); + JavaType type1 = JavaResolverUtils.erasure(substitutor1.substitute(param1.getType()), substitutor1); + JavaType type2 = JavaResolverUtils.erasure(substitutor2.substitute(param2.getType()), substitutor2); if (!(type1 == null ? type2 == null : type1.equals(type2))) return false; } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java index 8ed1579a2ea..6ef8baec4b4 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.jet.lang.psi.JetElement; -import org.jetbrains.jet.lang.resolve.java.JavaResolverPsiUtils; +import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; import javax.swing.*; @@ -148,11 +148,11 @@ public final class JetDescriptorIconProvider { return true; } else if (declaration instanceof PsiClass) { - return JavaResolverPsiUtils.isCompiledKotlinClassOrPackageClass((PsiClass) declaration); + return JavaResolverUtils.isCompiledKotlinClassOrPackageClass((PsiClass) declaration); } else if (declaration instanceof PsiMember) { PsiClass containingClass = ((PsiMember) declaration).getContainingClass(); - return containingClass != null && JavaResolverPsiUtils.isCompiledKotlinClassOrPackageClass(containingClass); + return containingClass != null && JavaResolverUtils.isCompiledKotlinClassOrPackageClass(containingClass); } else { return false; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java index 1aa9664b736..bf0db709429 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.descriptors.serialization.*; import org.jetbrains.jet.lang.descriptors.ClassKind; -import org.jetbrains.jet.lang.resolve.java.JavaResolverPsiUtils; +import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache; import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -138,7 +138,7 @@ public class JetFromJavaDescriptorHelper { FqName classFQN = new FqName(qualifiedName); - if (JavaResolverPsiUtils.isCompiledKotlinPackageClass(containingClass)) { + if (JavaResolverUtils.isCompiledKotlinPackageClass(containingClass)) { return classFQN.parent().child(Name.identifier(method.getName())); } } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt b/idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt index cf2cfe58c20..bb4235a3c12 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/KotlinLookupElementFactory.kt @@ -27,16 +27,11 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.plugin.JetDescriptorIconProvider -import org.jetbrains.jet.plugin.completion.handlers.CaretPosition -import org.jetbrains.jet.plugin.completion.handlers.GenerateLambdaInfo -import org.jetbrains.jet.plugin.completion.handlers.KotlinClassInsertHandler -import org.jetbrains.jet.plugin.completion.handlers.JetFunctionInsertHandler +import org.jetbrains.jet.plugin.completion.handlers.* import org.jetbrains.jet.renderer.DescriptorRenderer -import org.jetbrains.jet.plugin.completion.handlers.BaseDeclarationInsertHandler -import org.jetbrains.jet.plugin.completion.handlers.JetPropertyInsertHandler import com.intellij.psi.PsiClass import org.jetbrains.jet.asJava.KotlinLightClass -import org.jetbrains.jet.lang.resolve.java.JavaResolverPsiUtils +import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils import com.intellij.codeInsight.completion.JavaPsiClassReferenceElement public object KotlinLookupElementFactory { @@ -56,7 +51,7 @@ public object KotlinLookupElementFactory { if (descriptor is ClassifierDescriptor && declaration is PsiClass && declaration !is KotlinLightClass && - !JavaResolverPsiUtils.isCompiledKotlinClass(declaration)) { + !JavaResolverUtils.isCompiledKotlinClass(declaration)) { // for java classes we create special lookup elements // because they must be equal to ones created in TypesCompletion // otherwise we may have duplicates diff --git a/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt index 492d64fc649..034e0d8e799 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/TypesCompletion.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiClass import org.jetbrains.jet.asJava.KotlinLightClass import org.jetbrains.jet.lang.descriptors.ClassKind import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.lang.resolve.java.JavaResolverPsiUtils +import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns @@ -56,10 +56,10 @@ class TypesCompletion(val parameters: CompletionParameters, private fun addAdaptedJavaCompletion(collector: LookupElementsCollector) { AllClassesGetter.processJavaClasses(parameters, prefixMatcher, true, { psiClass -> if (psiClass!! !is KotlinLightClass) { // Kotlin non-compiled class should have already been added as kotlin element before - if (JavaResolverPsiUtils.isCompiledKotlinClass(psiClass)) { + if (JavaResolverUtils.isCompiledKotlinClass(psiClass)) { addLookupElementForCompiledKotlinClass(psiClass, collector) } - else if (!JavaResolverPsiUtils.isCompiledKotlinPackageClass(psiClass)) { + else if (!JavaResolverUtils.isCompiledKotlinPackageClass(psiClass)) { collector.addElementWithAutoInsertionSuppressed(KotlinLookupElementFactory.createLookupElementForJavaClass(psiClass)) } }