From 595975a66ecc2da283fbdb82eaaba0c9ef1e1a0f Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 17 Aug 2015 20:51:51 +0300 Subject: [PATCH] LookupLocation.NO_LOCATION_FROM_IDE -> NoLookupLocation.FROM_IDE --- .../incremental/components/LookupLocation.kt | 3 --- .../jetbrains/kotlin/idea/util/TypeUtils.kt | 4 ++-- .../IDELightClassGenerationSupport.java | 6 ++--- .../caches/resolve/JavaResolveExtension.kt | 6 ++--- .../kotlin/idea/util/ShortenReferences.kt | 4 ++-- .../smart/MultipleArgumentsItemProvider.kt | 4 ++-- .../smart/TypeInstantiationItems.kt | 4 ++-- .../smart/TypesWithContainsDetector.kt | 6 ++--- .../kotlin/idea/core/IterableTypesDetector.kt | 6 ++--- .../kotlin/idea/core/NameValidators.kt | 8 +++---- .../KotlinCopyPasteReferenceProcessor.kt | 6 ++--- ...PositionManagerLibraryClassFileSearcher.kt | 6 ++--- .../idea/imports/KotlinImportOptimizer.kt | 4 ++-- .../ConvertFunctionToPropertyIntention.kt | 4 ++-- .../ConvertPropertyToFunctionIntention.kt | 4 ++-- .../ChangeMemberFunctionSignatureFix.java | 4 ++-- .../callableBuilder/CallableBuilder.kt | 5 ++-- .../callableBuilder/typeUtils.kt | 10 ++++---- .../CreateParameterByRefActionFactory.kt | 4 ++-- .../changeSignature/JetChangeSignatureData.kt | 4 ++-- .../JetChangeSignatureUsageProcessor.java | 8 +++---- .../extractableAnalysisUtil.kt | 4 ++-- .../idea/util/ImportInsertHelperImpl.kt | 24 +++++++++---------- 23 files changed, 69 insertions(+), 69 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt b/core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt index 363c8eadc6a..c2715fb66cf 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt @@ -16,14 +16,11 @@ package org.jetbrains.kotlin.incremental.components -import kotlin.platform.platformStatic - public interface LookupLocation { companion object { @deprecated("Use more suitable constant if possible") val NO_LOCATION = NoLookupLocation.UNSORTED - val NO_LOCATION_FROM_IDE = NoLookupLocation.FROM_IDE val NO_LOCATION_FROM_BACKEND = NoLookupLocation.FROM_BACKEND val NO_LOCATION_FROM_TEST = NoLookupLocation.FROM_TEST } diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt index 9bbf896d579..d8c2d5752cd 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.load.java.JvmAnnotationNames.JETBRAINS_NOT_NULL_ANNOTATION import org.jetbrains.kotlin.load.java.JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION import org.jetbrains.kotlin.load.java.JvmAnnotationNames.JETBRAINS_READONLY_ANNOTATION @@ -82,7 +82,7 @@ fun JetType.isResolvableInScope(scope: JetScope?, checkTypeParameters: Boolean): if (descriptor == null || descriptor.getName().isSpecial()) return false if (!checkTypeParameters && descriptor is TypeParameterDescriptor) return true - return scope != null && scope.getClassifier(descriptor.name, LookupLocation.NO_LOCATION_FROM_IDE) == descriptor + return scope != null && scope.getClassifier(descriptor.name, NoLookupLocation.FROM_IDE) == descriptor } public fun JetType.approximateWithResolvableType(scope: JetScope?, checkTypeParameters: Boolean): JetType { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java index 52e82ad2b18..38385d76d97 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java @@ -50,6 +50,7 @@ import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex; import org.jetbrains.kotlin.idea.stubindex.JetTopLevelClassByPackageIndex; import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil; import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; +import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; @@ -60,7 +61,6 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.kotlin.resolve.scopes.JetScope; -import org.jetbrains.kotlin.incremental.components.LookupLocation; import java.io.IOException; import java.util.*; @@ -140,7 +140,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport if (declaration instanceof JetFunction) { JetFunction jetFunction = (JetFunction) declaration; Name name = jetFunction.getNameAsSafeName(); - Collection functions = packageDescriptor.getMemberScope().getFunctions(name, LookupLocation.NO_LOCATION_FROM_IDE); + Collection functions = packageDescriptor.getMemberScope().getFunctions(name, NoLookupLocation.FROM_IDE); for (FunctionDescriptor descriptor : functions) { ForceResolveUtil.forceResolveAllContents(descriptor); } @@ -148,7 +148,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport else if (declaration instanceof JetProperty) { JetProperty jetProperty = (JetProperty) declaration; Name name = jetProperty.getNameAsSafeName(); - Collection properties = packageDescriptor.getMemberScope().getProperties(name, LookupLocation.NO_LOCATION_FROM_IDE); + Collection properties = packageDescriptor.getMemberScope().getProperties(name, NoLookupLocation.FROM_IDE); for (VariableDescriptor descriptor : properties) { ForceResolveUtil.forceResolveAllContents(descriptor); } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt index 13f9090a6c9..c8b43d5b41b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.openapi.project.Project import com.intellij.psi.* import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.load.java.sources.JavaSourceElement import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.load.java.structure.impl.* @@ -74,7 +74,7 @@ fun PsiMember.getJavaMemberDescriptor(): DeclarationDescriptor? { } public fun JavaDescriptorResolver.resolveMethod(method: JavaMethod): FunctionDescriptor? { - return getContainingScope(method)?.getFunctions(method.name, LookupLocation.NO_LOCATION_FROM_IDE)?.findByJavaElement(method) + return getContainingScope(method)?.getFunctions(method.name, NoLookupLocation.FROM_IDE)?.findByJavaElement(method) } public fun JavaDescriptorResolver.resolveConstructor(constructor: JavaConstructor): ConstructorDescriptor? { @@ -82,7 +82,7 @@ public fun JavaDescriptorResolver.resolveConstructor(constructor: JavaConstructo } public fun JavaDescriptorResolver.resolveField(field: JavaField): PropertyDescriptor? { - return getContainingScope(field)?.getProperties(field.name, LookupLocation.NO_LOCATION_FROM_IDE)?.findByJavaElement(field) as? PropertyDescriptor + return getContainingScope(field)?.getProperties(field.name, NoLookupLocation.FROM_IDE)?.findByJavaElement(field) as? PropertyDescriptor } private fun JavaDescriptorResolver.getContainingScope(member: JavaMember): JetScope? { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt index 54e6eb66765..45bbcbccb6c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport import org.jetbrains.kotlin.idea.imports.getImportableTargets import org.jetbrains.kotlin.idea.util.ShortenReferences.Options -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType @@ -273,7 +273,7 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options. val typeReference = type.getStrictParentOfType()!! val scope = bindingContext[BindingContext.TYPE_RESOLUTION_SCOPE, typeReference]!! val name = target.getName() - val targetByName = if (target is ClassifierDescriptor) scope.getClassifier(name, LookupLocation.NO_LOCATION_FROM_IDE) else scope.getPackage(name) + val targetByName = if (target is ClassifierDescriptor) scope.getClassifier(name, NoLookupLocation.FROM_IDE) else scope.getPackage(name) val canShortenNow = targetByName?.asString() == target.asString() processQualifiedElement(type, target, canShortenNow) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt index ac3bafe7111..9b0b5c5109f 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.idea.JetDescriptorIconProvider import org.jetbrains.kotlin.idea.completion.* -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.renderer.render import org.jetbrains.kotlin.resolve.BindingContext @@ -90,7 +90,7 @@ class MultipleArgumentsItemProvider(val bindingContext: BindingContext, private fun variableInScope(parameter: ValueParameterDescriptor, scope: JetScope): VariableDescriptor? { val name = parameter.getName() //TODO: there can be more than one property with such name in scope and we should be able to select one (but we need API for this) - val variable = scope.getLocalVariable(name) ?: scope.getProperties(name, LookupLocation.NO_LOCATION_FROM_IDE).singleOrNull() ?: return null + val variable = scope.getLocalVariable(name) ?: scope.getProperties(name, NoLookupLocation.FROM_IDE).singleOrNull() ?: return null return if (smartCastCalculator.types(variable).any { JetTypeChecker.DEFAULT.isSubtypeOf(it, parameter.getType()) }) variable else diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt index a9ba273f8e6..7d204cc652d 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.idea.completion.handlers.KotlinFunctionInsertHandler import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMethodsHandler import org.jetbrains.kotlin.idea.core.psiClassToDescriptor import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.psi.JetClassOrObject @@ -254,7 +254,7 @@ class TypeInstantiationItems( is ClassDescriptor -> container.getStaticScope() else -> return } - val samConstructor = scope.getFunctions(`class`.name, LookupLocation.NO_LOCATION_FROM_IDE) + val samConstructor = scope.getFunctions(`class`.name, NoLookupLocation.FROM_IDE) .filterIsInstance() .singleOrNull() ?: return val lookupElement = lookupElementFactory.createLookupElement(samConstructor, bindingContext, false) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypesWithContainsDetector.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypesWithContainsDetector.kt index ef752abd14a..723518777bd 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypesWithContainsDetector.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypesWithContainsDetector.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.idea.completion.HeuristicSignatures import org.jetbrains.kotlin.idea.util.FuzzyType import org.jetbrains.kotlin.idea.util.nullability -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.types.JetType @@ -43,7 +43,7 @@ class TypesWithContainsDetector( private val containsName = Name.identifier("contains") private val booleanType = KotlinBuiltIns.getInstance().getBooleanType() - private val typesWithExtensionContains: Collection = scope.getFunctions(containsName, LookupLocation.NO_LOCATION_FROM_IDE) + private val typesWithExtensionContains: Collection = scope.getFunctions(containsName, NoLookupLocation.FROM_IDE) .filter { it.getExtensionReceiverParameter() != null && isGoodContainsFunction(it, listOf()) } .map { it.getExtensionReceiverParameter()!!.getType() } @@ -53,7 +53,7 @@ class TypesWithContainsDetector( private fun hasContainsNoCache(type: FuzzyType): Boolean { return type.nullability() != TypeNullability.NULLABLE && - type.type.memberScope.getFunctions(containsName, LookupLocation.NO_LOCATION_FROM_IDE).any { isGoodContainsFunction(it, type.freeParameters) } + type.type.memberScope.getFunctions(containsName, NoLookupLocation.FROM_IDE).any { isGoodContainsFunction(it, type.freeParameters) } || typesWithExtensionContains.any { type.checkIsSubtypeOf(it) != null } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/IterableTypesDetector.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/IterableTypesDetector.kt index 15ed9b366bd..ec290e8020f 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/IterableTypesDetector.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/IterableTypesDetector.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.frontend.di.createContainerForMacros import org.jetbrains.kotlin.idea.util.FuzzyType -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.resolve.BindingTraceContext @@ -42,7 +42,7 @@ public class IterableTypesDetector( private val cache = HashMap() private val iteratorName = Name.identifier("iterator") - private val typesWithExtensionIterator: Collection = scope.getFunctions(iteratorName, LookupLocation.NO_LOCATION_FROM_IDE) + private val typesWithExtensionIterator: Collection = scope.getFunctions(iteratorName, NoLookupLocation.FROM_IDE) .map { it.getExtensionReceiverParameter() } .filterNotNull() .map { it.getType() } @@ -75,7 +75,7 @@ public class IterableTypesDetector( } private fun canBeIterable(type: FuzzyType): Boolean { - return type.type.memberScope.getFunctions(iteratorName, LookupLocation.NO_LOCATION_FROM_IDE).isNotEmpty() || + return type.type.memberScope.getFunctions(iteratorName, NoLookupLocation.FROM_IDE).isNotEmpty() || typesWithExtensionIterator.any { type.checkIsSubtypeOf(it) != null } } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt index e7e6eb36b7c..7cc461ecd8c 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.allChildren @@ -97,11 +97,11 @@ public class NewDeclarationNameValidator( return when(target) { Target.VARIABLES -> - getProperties(name, LookupLocation.NO_LOCATION_FROM_IDE).any { !it.isExtension && it.isVisible() } || + getProperties(name, NoLookupLocation.FROM_IDE).any { !it.isExtension && it.isVisible() } || getLocalVariable(name) != null Target.FUNCTIONS_AND_CLASSES -> - getFunctions(name, LookupLocation.NO_LOCATION_FROM_IDE).any { !it.isExtension && it.isVisible() } || - getClassifier(name, LookupLocation.NO_LOCATION_FROM_IDE)?.let { it.isVisible() } ?: false + getFunctions(name, NoLookupLocation.FROM_IDE).any { !it.isExtension && it.isVisible() } || + getClassifier(name, NoLookupLocation.FROM_IDE)?.let { it.isVisible() } ?: false } } diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt index e957d30d0f9..3dc2d7f6cee 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -48,7 +48,7 @@ import org.jetbrains.kotlin.idea.references.JetSimpleNameReference import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.idea.util.application.runWriteAction -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.elementsInRange @@ -238,11 +238,11 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor = when (descriptor) { - is FunctionDescriptor -> packageDescriptor.memberScope.getFunctions(descriptor.name, LookupLocation.NO_LOCATION_FROM_IDE) - is PropertyDescriptor -> packageDescriptor.memberScope.getProperties(descriptor.name, LookupLocation.NO_LOCATION_FROM_IDE) + is FunctionDescriptor -> packageDescriptor.memberScope.getFunctions(descriptor.name, NoLookupLocation.FROM_IDE) + is PropertyDescriptor -> packageDescriptor.memberScope.getProperties(descriptor.name, NoLookupLocation.FROM_IDE) else -> { reportError(topLevelDeclaration, descriptor) listOf() diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt index cebeafc4be0..037cb14f138 100644 --- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings import org.jetbrains.kotlin.idea.references.JetReference import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.idea.util.application.runWriteAction -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* @@ -199,7 +199,7 @@ public class KotlinImportOptimizer() : ImportOptimizer { val scope = fileWithImports.getResolutionFacade().getFileTopLevelScope(fileWithImports) for (fqName in classNamesToCheck) { - if (scope.getClassifier(fqName.shortName(), LookupLocation.NO_LOCATION_FROM_IDE)?.importableFqNameSafe != fqName) { + if (scope.getClassifier(fqName.shortName(), NoLookupLocation.FROM_IDE)?.importableFqNameSafe != fqName) { // add explicit import if failed to import with * (or from current package) importsToGenerate.add(ImportPath(fqName, false)) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt index f3cbd3dcae8..87f03a5f70f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.idea.search.usagesSearch.search import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.idea.util.application.executeWriteCommand -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* @@ -115,7 +115,7 @@ public class ConvertFunctionToPropertyIntention : JetSelfTargetingIntention, scope: JetScope): List { return typeParameters.filter { typeParameter -> - val classifier = scope.getClassifier(typeParameter.name, LookupLocation.NO_LOCATION_FROM_IDE) + val classifier = scope.getClassifier(typeParameter.name, NoLookupLocation.FROM_IDE) classifier == null || classifier != typeParameter } } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt index 90a8e8c5a7d..f44c49e62a5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getTyp import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.guessTypes import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement @@ -137,5 +137,5 @@ fun JetType.hasTypeParametersToAdd(functionDescriptor: FunctionDescriptor, conte else -> null } ?: return true - return typeParametersToAdd.any { scope.getClassifier(it.name, LookupLocation.NO_LOCATION_FROM_IDE) != it } + return typeParametersToAdd.any { scope.getClassifier(it.name, NoLookupLocation.FROM_IDE) != it } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt index 3dd14c1d748..e1b0a10ff48 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.core.CollectingNameValidator import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetCallableDefinitionUsage -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.kotlin.psi.JetClass @@ -81,7 +81,7 @@ public class JetChangeSignatureData( val validator = bodyScope?.let { bodyScope -> CollectingNameValidator(paramNames) { val name = Name.identifier(it) - bodyScope.getLocalVariable(name) == null && bodyScope.getProperties(name, LookupLocation.NO_LOCATION_FROM_IDE).isEmpty() + bodyScope.getLocalVariable(name) == null && bodyScope.getProperties(name, NoLookupLocation.FROM_IDE).isEmpty() } } ?: CollectingNameValidator(paramNames) val receiverType = baseDescriptor.getExtensionReceiverParameter()?.getType() ?: return null diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java index 8c0f028bcbf..24af0ba50bc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java @@ -57,6 +57,7 @@ import org.jetbrains.kotlin.idea.references.JetSimpleNameReference; import org.jetbrains.kotlin.idea.references.ReferencesPackage; import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchPackage; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; +import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.kdoc.psi.impl.KDocName; import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor; import org.jetbrains.kotlin.name.Name; @@ -74,7 +75,6 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.scopes.JetScope; -import org.jetbrains.kotlin.incremental.components.LookupLocation; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver; import org.jetbrains.kotlin.types.JetType; @@ -623,8 +623,8 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro if (!kind.getIsConstructor() && callableScope != null && !info.getNewName().isEmpty()) { Name newName = Name.identifier(info.getNewName()); Collection conflicts = oldDescriptor instanceof FunctionDescriptor - ? callableScope.getFunctions(newName, LookupLocation.NO_LOCATION_FROM_IDE) - : callableScope.getProperties(newName, LookupLocation.NO_LOCATION_FROM_IDE); + ? callableScope.getFunctions(newName, NoLookupLocation.FROM_IDE) + : callableScope.getProperties(newName, NoLookupLocation.FROM_IDE); for (CallableDescriptor conflict : conflicts) { if (conflict == oldDescriptor) continue; @@ -647,7 +647,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro } if (parametersScope != null) { if (kind == JetMethodDescriptor.Kind.PRIMARY_CONSTRUCTOR && valOrVar != JetValVar.None) { - for (VariableDescriptor property : parametersScope.getProperties(Name.identifier(parameterName), LookupLocation.NO_LOCATION_FROM_IDE)) { + for (VariableDescriptor property : parametersScope.getProperties(Name.identifier(parameterName), NoLookupLocation.FROM_IDE)) { PsiElement propertyDeclaration = DescriptorToSourceUtils.descriptorToDeclaration(property); if (propertyDeclaration != null && !(propertyDeclaration.getParent() instanceof JetParameterList)) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt index eb19cf39072..d107957660b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt @@ -60,7 +60,7 @@ import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.approximateWithResolvableType import org.jetbrains.kotlin.idea.util.isResolvableInScope -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.kotlin.renderer.DescriptorRenderer @@ -650,7 +650,7 @@ private fun ExtractionData.inferParametersInfo( options.captureLocalFunctions && originalRef.getReferencedName() == originalDescriptor.getName().asString() // to forbid calls by convention && originalDeclaration is JetNamedFunction && originalDeclaration.isLocal() - && (targetScope == null || originalDescriptor !in targetScope.getFunctions(originalDescriptor.name, LookupLocation.NO_LOCATION_FROM_IDE)) + && (targetScope == null || originalDescriptor !in targetScope.getFunctions(originalDescriptor.name, NoLookupLocation.FROM_IDE)) val descriptorToExtract = (if (extractThis) thisDescriptor else null) ?: originalDescriptor diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt index 7673c0f40a2..dd746e2c938 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.project.ProjectStructureUtil import org.jetbrains.kotlin.idea.refactoring.fqName.isImported import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.idea.util.ImportInsertHelper.ImportDescriptorResult -import org.jetbrains.kotlin.incremental.components.LookupLocation +import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* @@ -121,18 +121,18 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert // check if import is not needed when (target) { is ClassDescriptor -> { - val classifier = topLevelScope.getClassifier(name, LookupLocation.NO_LOCATION_FROM_IDE) + val classifier = topLevelScope.getClassifier(name, NoLookupLocation.FROM_IDE) if (classifier?.importableFqName == targetFqName) return ImportDescriptorResult.ALREADY_IMPORTED } is PackageViewDescriptor -> { if (topLevelScope.getPackage(name)?.importableFqName == targetFqName) return ImportDescriptorResult.ALREADY_IMPORTED } is FunctionDescriptor -> { - val functions = topLevelScope.getFunctions(name, LookupLocation.NO_LOCATION_FROM_IDE) + val functions = topLevelScope.getFunctions(name, NoLookupLocation.FROM_IDE) if (functions.map { it.importableFqName }.contains(targetFqName)) return ImportDescriptorResult.ALREADY_IMPORTED } is PropertyDescriptor -> { - val properties = topLevelScope.getProperties(name, LookupLocation.NO_LOCATION_FROM_IDE) + val properties = topLevelScope.getProperties(name, NoLookupLocation.FROM_IDE) if (properties.map { it.importableFqName }.contains(targetFqName)) return ImportDescriptorResult.ALREADY_IMPORTED } else -> { @@ -151,7 +151,7 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert // check there is an explicit import of a class/package with the same name already val conflict = when (target) { - is ClassDescriptor -> topLevelScope.getClassifier(name, LookupLocation.NO_LOCATION_FROM_IDE) + is ClassDescriptor -> topLevelScope.getClassifier(name, NoLookupLocation.FROM_IDE) is PackageViewDescriptor -> topLevelScope.getPackage(name) else -> null } @@ -170,7 +170,7 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert && when (target) { // this check does not give a guarantee that import with * will import the class - for example, // there can be classes with conflicting name in more than one import with * - is ClassDescriptor -> topLevelScope.getClassifier(name, LookupLocation.NO_LOCATION_FROM_IDE) == null + is ClassDescriptor -> topLevelScope.getClassifier(name, NoLookupLocation.FROM_IDE) == null is PackageViewDescriptor -> false is FunctionDescriptor, is PropertyDescriptor -> true else -> throw Exception() @@ -236,12 +236,12 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert val topLevelScope = resolutionFacade.getFileTopLevelScope(file) val conflictCandidates: List = classNamesToImport .flatMap { - importedScopes.map { scope -> scope.getClassifier(it, LookupLocation.NO_LOCATION_FROM_IDE) }.filterNotNull() + importedScopes.map { scope -> scope.getClassifier(it, NoLookupLocation.FROM_IDE) }.filterNotNull() } .filter { importedClass -> isVisible(importedClass) // check that class is really imported - && topLevelScope.getClassifier(importedClass.name, LookupLocation.NO_LOCATION_FROM_IDE) == importedClass + && topLevelScope.getClassifier(importedClass.name, NoLookupLocation.FROM_IDE) == importedClass // and not yet imported explicitly && imports.all { it.importPath != ImportPath(importedClass.importableFqNameSafe, false) } } @@ -251,7 +251,7 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert if (target is ClassDescriptor) { val newTopLevelScope = resolutionFacade.getFileTopLevelScope(file) - val resolvedTo = newTopLevelScope.getClassifier(target.name, LookupLocation.NO_LOCATION_FROM_IDE) + val resolvedTo = newTopLevelScope.getClassifier(target.name, NoLookupLocation.FROM_IDE) if (resolvedTo?.importableFqNameSafe != targetFqName) { addedImport.delete() return ImportDescriptorResult.FAIL @@ -274,7 +274,7 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert } val parentScope = getMemberScope(fqName.parent(), moduleDescriptor) ?: return null - val classifier = parentScope.getClassifier(fqName.shortName(), LookupLocation.NO_LOCATION_FROM_IDE) + val classifier = parentScope.getClassifier(fqName.shortName(), NoLookupLocation.FROM_IDE) val classDescriptor = classifier as? ClassDescriptor ?: return null return classDescriptor.getDefaultType().getMemberScope() } @@ -286,7 +286,7 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert // check if there is a conflicting class imported with * import // (not with explicit import - explicit imports are checked before this method invocation) - val classifier = topLevelScope.getClassifier(name, LookupLocation.NO_LOCATION_FROM_IDE) + val classifier = topLevelScope.getClassifier(name, NoLookupLocation.FROM_IDE) if (classifier != null && detectNeededImports(listOf(classifier)).isNotEmpty()) { return ImportDescriptorResult.FAIL } @@ -315,7 +315,7 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert if (importsToCheck.isNotEmpty()) { val topLevelScope = resolutionFacade.getFileTopLevelScope(file) for (classFqName in importsToCheck) { - val classifier = topLevelScope.getClassifier(classFqName.shortName(), LookupLocation.NO_LOCATION_FROM_IDE) + val classifier = topLevelScope.getClassifier(classFqName.shortName(), NoLookupLocation.FROM_IDE) if (classifier?.importableFqNameSafe != classFqName) { addImport(classFqName, false) // restore explicit import }