diff --git a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt index 2b4d16469c2..babc3247531 100644 --- a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt @@ -115,7 +115,7 @@ public class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) { val serializer = DescriptorSerializer.createTopLevel(BuiltInsSerializerExtension) - val classifierDescriptors = DescriptorSerializer.sort(packageView.getMemberScope().getDescriptors(DescriptorKindFilter.CLASSIFIERS)) + val classifierDescriptors = DescriptorSerializer.sort(packageView.memberScope.getDescriptors(DescriptorKindFilter.CLASSIFIERS)) serializeClasses(classifierDescriptors, serializer) { classDescriptor, classProto -> @@ -125,7 +125,7 @@ public class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) { } val packageStream = ByteArrayOutputStream() - val fragments = packageView.getFragments() + val fragments = packageView.fragments val packageProto = serializer.packageProto(fragments).build() ?: error("Package fragments not serialized: $fragments") packageProto.writeTo(packageStream) write(destDir, BuiltInsSerializedResourcePaths.getPackageFilePath(fqName), packageStream, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt index 06a12197bec..2b80c7de0a5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.scopes.AbstractScopeAdapter import org.jetbrains.kotlin.resolve.scopes.JetScope class NoSubpackagesInPackageScope(packageDescriptor: PackageViewDescriptor) : AbstractScopeAdapter() { - override val workerScope: JetScope = packageDescriptor.getMemberScope() + override val workerScope: JetScope = packageDescriptor.memberScope override fun getPackage(name: Name): PackageViewDescriptor? = null diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt index 8aa8308fb94..73add7426ef 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt @@ -87,7 +87,7 @@ class QualifierReceiver ( fun getNestedClassesAndPackageMembersScope(): JetScope { val scopes = ArrayList(4) - scopes.addIfNotNull(packageView?.getMemberScope()) + scopes.addIfNotNull(packageView?.memberScope) if (classifier is ClassDescriptor) { scopes.add(classifier.getStaticScope()) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 751fde20e7e..759cbea44b9 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -113,7 +113,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() { private fun checkClassInPackage(moduleDescriptor: ModuleDescriptor, packageName: String, className: String) { val kotlinPackage = moduleDescriptor.getPackage(FqName(packageName))!! val kotlinClassName = Name.identifier(className) - val kotlinClass = kotlinPackage.getMemberScope().getClassifier(kotlinClassName) as ClassDescriptor + val kotlinClass = kotlinPackage.memberScope.getClassifier(kotlinClassName) as ClassDescriptor checkClass(kotlinClass) } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index 70fe2d95140..d61601619fc 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -145,7 +145,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi if (header?.kind == KotlinClassHeader.Kind.PACKAGE_FACADE) { val packageView = module.getPackage(LoadDescriptorUtil.TEST_PACKAGE_FQNAME).sure { "Couldn't resolve package ${LoadDescriptorUtil.TEST_PACKAGE_FQNAME}" } - packageScopes.add(packageView.getMemberScope()) + packageScopes.add(packageView.memberScope) } else if (header == null || (header.kind == KotlinClassHeader.Kind.CLASS && header.classKind == JvmAnnotationNames.KotlinClass.Kind.CLASS)) { @@ -179,7 +179,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi ) } - private class SyntheticPackageViewForTest(private val module: ModuleDescriptor, + private class SyntheticPackageViewForTest(override val module: ModuleDescriptor, packageScopes: List, classes: List) : PackageViewDescriptor { private val scope: JetScope @@ -191,9 +191,10 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi scope = ChainedScope(this, "synthetic package view for test", writableScope, *packageScopes.toTypedArray()) } - override fun getFqName() = LoadDescriptorUtil.TEST_PACKAGE_FQNAME - override fun getMemberScope() = scope - override fun getModule() = module + override val fqName: FqName + get() = LoadDescriptorUtil.TEST_PACKAGE_FQNAME + override val memberScope: JetScope + get() = scope override fun accept(visitor: DeclarationDescriptorVisitor, data: D): R = visitor.visitPackageViewDescriptor(this, data) @@ -203,6 +204,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi override fun acceptVoid(visitor: DeclarationDescriptorVisitor?) = throw UnsupportedOperationException() override fun getAnnotations() = throw UnsupportedOperationException() override fun getName() = throw UnsupportedOperationException() - override fun getFragments() = throw UnsupportedOperationException() + override val fragments: Nothing + get() = throw UnsupportedOperationException() } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt index 0ed90f84229..032895c9f22 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt @@ -32,7 +32,7 @@ val KOTLIN_REFLECT_FQ_NAME = FqName("kotlin.reflect") public class ReflectionTypes(private val module: ModuleDescriptor) { private val kotlinReflectScope: JetScope? by Delegates.lazy { - module.getPackage(KOTLIN_REFLECT_FQ_NAME)?.getMemberScope() + module.getPackage(KOTLIN_REFLECT_FQ_NAME)?.memberScope } fun find(className: String): ClassDescriptor { diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/BuiltInFictitiousFunctionClassFactory.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/BuiltInFictitiousFunctionClassFactory.kt index de1ca110d4e..a5a787f4962 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/BuiltInFictitiousFunctionClassFactory.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/BuiltInFictitiousFunctionClassFactory.kt @@ -73,7 +73,7 @@ public class BuiltInFictitiousFunctionClassFactory( val kindWithArity = parseClassName(className, packageFqName) ?: return null val (kind, arity) = kindWithArity // KT-5100 - val containingPackageFragment = module.getPackage(packageFqName)!!.getFragments().single() + val containingPackageFragment = module.getPackage(packageFqName)!!.fragments.single() return FunctionClassDescriptor(storageManager, containingPackageFragment, kind, arity) } diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt index 33f5e98b236..24c1e93745e 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt @@ -158,7 +158,7 @@ public class FunctionClassDescriptor( if (functionKind.hasExtensionReceiver) functionArity++ val module = containingDeclaration.getContainingDeclaration() - val kotlinPackageFragment = module.getPackage(BUILT_INS_PACKAGE_FQ_NAME)!!.getFragments().single() + val kotlinPackageFragment = module.getPackage(BUILT_INS_PACKAGE_FQ_NAME)!!.fragments.single() // If this is a KMemberFunction{n} or KExtensionFunction{n}, it extends Function{n} with the annotation kotlin.extension, // so that the value of this type is callable as an extension function, with the receiver before the dot diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.kt similarity index 50% rename from core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.kt index a7707fdde8c..10d4b4044ab 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.kt @@ -14,29 +14,19 @@ * limitations under the License. */ -package org.jetbrains.kotlin.descriptors; +package org.jetbrains.kotlin.descriptors -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.resolve.scopes.JetScope -import java.util.List; +public interface PackageViewDescriptor : DeclarationDescriptor { + override fun getContainingDeclaration(): PackageViewDescriptor? -public interface PackageViewDescriptor extends DeclarationDescriptor { - @Override - @Nullable - PackageViewDescriptor getContainingDeclaration(); + public val fqName: FqName - @NotNull - FqName getFqName(); + public val memberScope: JetScope - @NotNull - JetScope getMemberScope(); + public val module: ModuleDescriptor - @NotNull - ModuleDescriptor getModule(); - - @NotNull - List getFragments(); + public val fragments: List } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageViewDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageViewDescriptorImpl.kt index 8d30a14eac3..c20ad31f353 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageViewDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageViewDescriptorImpl.kt @@ -24,11 +24,11 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.types.TypeSubstitutor public class PackageViewDescriptorImpl( - private val module: ModuleDescriptor, - private val fqName: FqName, - private val fragments: List + override val module: ModuleDescriptor, + override val fqName: FqName, + override val fragments: List ) : DeclarationDescriptorImpl(Annotations.EMPTY, fqName.shortNameOrSpecial()), PackageViewDescriptor { - private val memberScope: JetScope = run { + override val memberScope: JetScope = run { assert(fragments.isNotEmpty()) { "$fqName in module" } val scopes = fragments.map { it.getMemberScope() } + SubpackagesScope(this) @@ -41,14 +41,6 @@ public class PackageViewDescriptorImpl( override fun accept(visitor: DeclarationDescriptorVisitor, data: D): R = visitor.visitPackageViewDescriptor(this, data) - override fun getFqName(): FqName = fqName - - override fun getMemberScope(): JetScope = memberScope - - override fun getModule(): ModuleDescriptor = module - - override fun getFragments() = fragments - override fun equals(other: Any?): Boolean { if (javaClass != other?.javaClass) return false diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt index bd0cc6cdd3a..9f19a58cc00 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt @@ -764,10 +764,10 @@ internal class DescriptorRendererImpl( private fun renderPackageView(packageView: PackageViewDescriptor, builder: StringBuilder) { builder.append(renderKeyword("package")).append(" ") - builder.append(renderFqName(packageView.getFqName())) + builder.append(renderFqName(packageView.fqName)) if (debugMode) { builder.append(" in context of ") - renderName(packageView.getModule(), builder) + renderName(packageView.module, builder) } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt index 73c8d72f1f2..341cd3aa224 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt @@ -44,7 +44,7 @@ public val DeclarationDescriptor.module: ModuleDescriptor public fun ModuleDescriptor.resolveTopLevelClass(topLevelClassFqName: FqName): ClassDescriptor? { assert(!topLevelClassFqName.isRoot()) - return getPackage(topLevelClassFqName.parent())?.getMemberScope() + return getPackage(topLevelClassFqName.parent())?.memberScope ?.getClassifier(topLevelClassFqName.shortName()) as? ClassDescriptor } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt index a639504d2a4..782aa49aabc 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.name.ClassId public fun ModuleDescriptor.findClassAcrossModuleDependencies(classId: ClassId): ClassDescriptor? { val packageViewDescriptor = getPackage(classId.getPackageFqName()) ?: return null val segments = classId.getRelativeClassName().pathSegments() - val topLevelClass = packageViewDescriptor.getMemberScope().getClassifier(segments.first()) as? ClassDescriptor ?: return null + val topLevelClass = packageViewDescriptor.memberScope.getClassifier(segments.first()) as? ClassDescriptor ?: return null var result = topLevelClass for (name in segments.subList(1, segments.size())) { result = result.getUnsubstitutedInnerClassesScope().getClassifier(name) as? ClassDescriptor ?: return null diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt index 67d65787724..a661a684fa5 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt @@ -29,7 +29,7 @@ class KPackageImpl(override val jClass: Class<*>) : KCallableContainerImpl(), KP moduleData.module.getPackage(fqName) ?: throw KotlinReflectionInternalError("Package not resolved: $fqName") } - override val scope: JetScope get() = descriptor.getMemberScope() + override val scope: JetScope get() = descriptor.memberScope fun topLevelVariable(name: String): KTopLevelVariable<*> = KTopLevelVariableImpl(this, name) diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt index a6759c51444..db5d245644f 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt @@ -421,17 +421,17 @@ public abstract class ElementResolver protected constructor( val descriptors = if (element is JetDotQualifiedExpression) { qualifiedExpressionResolver.lookupDescriptorsForQualifiedExpression( - element, rootPackage.getMemberScope(), filePackage, trace, QualifiedExpressionResolver.LookupMode.EVERYTHING, false) + element, rootPackage.memberScope, filePackage, trace, QualifiedExpressionResolver.LookupMode.EVERYTHING, false) } else { qualifiedExpressionResolver.lookupDescriptorsForSimpleNameReference( - element as JetSimpleNameExpression, rootPackage.getMemberScope(), filePackage, trace, QualifiedExpressionResolver.LookupMode.EVERYTHING, false, false) + element as JetSimpleNameExpression, rootPackage.memberScope, filePackage, trace, QualifiedExpressionResolver.LookupMode.EVERYTHING, false, false) } - return descriptors.firstIsInstanceOrNull()?.getMemberScope() + return descriptors.firstIsInstanceOrNull()?.memberScope } else { - return rootPackage.getMemberScope() + return rootPackage.memberScope } } @@ -439,7 +439,7 @@ public abstract class ElementResolver protected constructor( val packageDirective = expression.getParentOfType(false) if (packageDirective != null) { val packageDescriptor = resolveSession.getModuleDescriptor().getPackage(packageDirective.getFqName(expression as JetSimpleNameExpression).parent()) - return packageDescriptor?.getMemberScope() + return packageDescriptor?.memberScope } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt index 3d6b04ee15e..ddcd2fb7b53 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt @@ -129,7 +129,7 @@ private fun resolveParamLink(fromDescriptor: DeclarationDescriptor, qualifiedNam private fun getPackageInnerScope(descriptor: PackageFragmentDescriptor): JetScope { val module = descriptor.getContainingDeclaration() val packageView = module.getPackage(descriptor.fqName) - val packageScope = packageView!!.getMemberScope() + val packageScope = packageView!!.memberScope return packageScope } @@ -155,7 +155,7 @@ public fun getResolutionScope(resolutionFacade: ResolutionFacade, descriptor: De getPackageInnerScope(descriptor) is PackageViewDescriptor -> - descriptor.getMemberScope() + descriptor.memberScope is ClassDescriptor -> getClassInnerScope(getOuterScope(descriptor, resolutionFacade), descriptor) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReference.kt index 58d53a9b93b..f56408f4947 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReference.kt @@ -93,7 +93,7 @@ public abstract class AbstractJetReference(element: T) private fun resolveToPsiElements(targetDescriptor: DeclarationDescriptor): Collection { if (targetDescriptor is PackageViewDescriptor) { val psiFacade = JavaPsiFacade.getInstance(expression.getProject()) - val fqName = targetDescriptor.getFqName().asString() + val fqName = targetDescriptor.fqName.asString() return psiFacade.findPackage(fqName).singletonOrEmptyList() } else { diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DataFlowInfoUtilForCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DataFlowInfoUtilForCompletion.kt index 789b877f5e0..f5447fba29e 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DataFlowInfoUtilForCompletion.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/DataFlowInfoUtilForCompletion.kt @@ -31,7 +31,7 @@ fun renderDataFlowValue(value: DataFlowValue): String? { is JetExpression -> id.getText() is ThisReceiver -> "this@${id.getDeclarationDescriptor().getName()}" is VariableDescriptor -> id.getName().asString() - is PackageViewDescriptor -> id.getFqName().asString() + is PackageViewDescriptor -> id.fqName.asString() is com.intellij.openapi.util.Pair<*, *> -> renderId(id.first) + "." + renderId(id.second) else -> null } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt index ab7d0c3e7e8..ce1fd8a46b0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt @@ -69,8 +69,8 @@ fun findPackagePartInternalNameForLibraryFile(topLevelDeclaration: JetDeclaratio val descFromSourceText = render(descriptor) val descriptors: Collection = when (descriptor) { - is FunctionDescriptor -> packageDescriptor.getMemberScope().getFunctions(descriptor.getName()) - is PropertyDescriptor -> packageDescriptor.getMemberScope().getProperties(descriptor.getName()) + is FunctionDescriptor -> packageDescriptor.memberScope.getFunctions(descriptor.getName()) + is PropertyDescriptor -> packageDescriptor.memberScope.getProperties(descriptor.getName()) 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 179d15f156f..4a1a1994516 100644 --- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt @@ -197,7 +197,7 @@ public class KotlinImportOptimizer() : ImportOptimizer { ?: reference.resolveToDescriptors(bindingContext) for (target in targets) { if (!target.canBeReferencedViaImport()) continue - if (target is PackageViewDescriptor && target.getFqName().parent() == FqName.ROOT) continue // no need to import top-level packages + if (target is PackageViewDescriptor && target.fqName.parent() == FqName.ROOT) continue // no need to import top-level packages if (!target.isExtension) { // for non-extension targets, count only non-qualified simple name usages if (element !is JetNameReferenceExpression) continue diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithAnnotationAnalyzer.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithAnnotationAnalyzer.kt index e243c74eca6..97ef825efb8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithAnnotationAnalyzer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithAnnotationAnalyzer.kt @@ -167,7 +167,7 @@ object ReplaceWithAnnotationAnalyzer { } is PackageViewDescriptor -> - descriptor.getMemberScope() + descriptor.memberScope is ClassDescriptorWithResolutionScopes -> descriptor.getScopeForMemberDeclarationResolution() diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index 23e4eeeae71..a239a1d7638 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -329,7 +329,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { private fun getDeclarationScope(): JetScope { if (config.isExtension || receiverClassDescriptor == null) { - return currentFileModule.getPackage(config.currentFile.getPackageFqName())!!.getMemberScope() + return currentFileModule.getPackage(config.currentFile.getPackageFqName())!!.memberScope } if (receiverClassDescriptor is ClassDescriptorWithResolutionScopes) { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt index 18473f50526..884289bd477 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt @@ -63,8 +63,8 @@ private fun getTargetParentByQualifier( qualifierDescriptor is ClassDescriptor -> DescriptorToSourceUtilsIde.getAnyDeclaration(project, qualifierDescriptor) qualifierDescriptor is PackageViewDescriptor -> - if (qualifierDescriptor.getFqName() != file.getPackageFqName()) { - JavaPsiFacade.getInstance(project).findPackage(qualifierDescriptor.getFqName().asString()) + if (qualifierDescriptor.fqName != file.getPackageFqName()) { + JavaPsiFacade.getInstance(project).findPackage(qualifierDescriptor.fqName.asString()) } else file : PsiElement else -> diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt index c602b2f86be..8d766c6816e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt @@ -264,7 +264,7 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert private fun getMemberScope(fqName: FqName, moduleDescriptor: ModuleDescriptor): JetScope? { val packageView = moduleDescriptor.getPackage(fqName) if (packageView != null) { - return packageView.getMemberScope() + return packageView.memberScope } val parentScope = getMemberScope(fqName.parent(), moduleDescriptor) ?: return null diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt index 2a4dcb3df59..670274de2cb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt @@ -68,7 +68,7 @@ private class ResolverForDecompilerImpl(val module: ModuleDescriptor) : Resolver override fun resolveDeclarationsInPackage(packageFqName: FqName): Collection { val packageView = module.getPackage(packageFqName) ?: return listOf() - return packageView.getMemberScope().getAllDescriptors() filter { + return packageView.memberScope.getAllDescriptors() filter { it is CallableMemberDescriptor && it.module != KotlinBuiltIns.getInstance().getBuiltInsModule() } sortBy MemberComparator.INSTANCE } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt index 43fcd156d01..f8e9ecc50dc 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt @@ -249,7 +249,7 @@ public abstract class AbstractRenameTest : KotlinMultiFileTestCase() { val scopeToSearch = if (classIdStr != null) { module.findClassAcrossModuleDependencies(classIdStr.toClassId())!!.getDefaultType().getMemberScope() } else { - module.getPackage(FqName(packageFqnStr!!))!!.getMemberScope() + module.getPackage(FqName(packageFqnStr!!))!!.memberScope } val psiElement = DescriptorToSourceUtils.descriptorToDeclaration(findDescriptorToRename(scopeToSearch))!! diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt index 83227f9daeb..58ed9b5e7b5 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt @@ -107,7 +107,7 @@ public object KotlinJavascriptSerializationUtil { val serializer = DescriptorSerializer.createTopLevel(KotlinJavascriptSerializerExtension) - val classifierDescriptors = DescriptorSerializer.sort(packageView.getMemberScope().getDescriptors(DescriptorKindFilter.CLASSIFIERS)) + val classifierDescriptors = DescriptorSerializer.sort(packageView.memberScope.getDescriptors(DescriptorKindFilter.CLASSIFIERS)) ClassSerializationUtil.serializeClasses(classifierDescriptors, serializer, object : ClassSerializationUtil.Sink { override fun writeClass(classDescriptor: ClassDescriptor, classProto: ProtoBuf.Class) { @@ -118,7 +118,7 @@ public object KotlinJavascriptSerializationUtil { }, skip) val packageStream = ByteArrayOutputStream() - val fragments = packageView.getFragments() + val fragments = packageView.fragments val packageProto = serializer.packageProto(fragments, skip).build() ?: error("Package fragments not serialized: $fragments") if (packageProto.getMemberCount() > 0) { packageProto.writeTo(packageStream)