From 470dfc9becfbed999a78ecd860096a9147025067 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 11 Dec 2015 16:07:13 +0100 Subject: [PATCH] remove "Jet" from names of classes related to resolve/scopes --- .../kotlin/cli/jvm/repl/ReplInterpreter.java | 4 ++-- .../kotlin/resolve/BodyResolver.java | 10 ++++---- .../resolve/DelegatedPropertyResolver.java | 6 ++--- .../kotlin/resolve/DescriptorResolver.java | 6 ++--- .../CallableReferencesResolutionUtils.kt | 4 ++-- .../kotlin/resolve/lazy/ResolveSession.java | 18 +++++++------- .../{JetClassInfo.java => KtClassInfo.java} | 4 ++-- ...lassInfoUtil.java => KtClassInfoUtil.java} | 8 +++---- ...lassLikeInfo.java => KtClassLikeInfo.java} | 2 +- ...jectInfo.java => KtClassOrObjectInfo.java} | 4 ++-- .../{JetObjectInfo.java => KtObjectInfo.java} | 4 ++-- .../{JetScriptInfo.kt => KtScriptInfo.kt} | 4 ++-- .../AbstractPsiBasedDeclarationProvider.kt | 14 +++++------ .../ClassMemberDeclarationProvider.kt | 4 ++-- .../lazy/declarations/DeclarationProvider.kt | 4 ++-- .../DeclarationProviderFactory.java | 4 ++-- .../FileBasedDeclarationProviderFactory.java | 4 ++-- .../PsiBasedClassMemberDeclarationProvider.kt | 4 ++-- .../descriptors/AbstractLazyMemberScope.kt | 4 ++-- .../lazy/descriptors/LazyClassDescriptor.java | 24 +++++++++---------- .../lazy/descriptors/LazyScriptDescriptor.kt | 4 ++-- .../{JetScopeUtils.java => ScopeUtils.java} | 4 ++-- .../resolve/scopes/receivers/Qualifier.kt | 4 ++-- .../expressions/LocalClassifierAnalyzer.kt | 8 +++---- .../kotlin/idea/kdoc/KDocReference.kt | 2 +- .../PluginDeclarationProviderFactory.kt | 4 ++-- ...ubBasedPackageMemberDeclarationProvider.kt | 14 +++++------ .../ReplaceWithAnnotationAnalyzer.kt | 2 +- 28 files changed, 88 insertions(+), 90 deletions(-) rename compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/{JetClassInfo.java => KtClassInfo.java} (92%) rename compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/{JetClassInfoUtil.java => KtClassInfoUtil.java} (80%) rename compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/{JetClassLikeInfo.java => KtClassLikeInfo.java} (96%) rename compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/{JetClassOrObjectInfo.java => KtClassOrObjectInfo.java} (94%) rename compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/{JetObjectInfo.java => KtObjectInfo.java} (90%) rename compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/{JetScriptInfo.kt => KtScriptInfo.kt} (96%) rename compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/{JetScopeUtils.java => ScopeUtils.java} (98%) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java index 69c2c1b688a..c6b9e68e1c6 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java @@ -65,7 +65,7 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo; +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo; import org.jetbrains.kotlin.resolve.lazy.declarations.*; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyScriptDescriptor; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; @@ -478,7 +478,7 @@ public class ReplInterpreter { @NotNull @Override - public ClassMemberDeclarationProvider getClassMemberDeclarationProvider(@NotNull JetClassLikeInfo classLikeInfo) { + public ClassMemberDeclarationProvider getClassMemberDeclarationProvider(@NotNull KtClassLikeInfo classLikeInfo) { return delegateFactory.getClassMemberDeclarationProvider(classLikeInfo); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index 1f6f664a7d7..d44fdfd72dc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -592,7 +592,7 @@ public class BodyResolver { PreliminaryDeclarationVisitor.Companion.createForDeclaration(property, trace); KtExpression initializer = property.getInitializer(); - LexicalScope propertyHeaderScope = JetScopeUtils.makeScopeForPropertyHeader(getScopeForProperty(c, property), propertyDescriptor); + LexicalScope propertyHeaderScope = ScopeUtils.makeScopeForPropertyHeader(getScopeForProperty(c, property), propertyDescriptor); if (initializer != null) { resolvePropertyInitializer(c.getOuterDataFlowInfo(), property, propertyDescriptor, initializer, propertyHeaderScope); @@ -641,7 +641,7 @@ public class BodyResolver { ) { LexicalScope accessorDeclaringScope = c.getDeclaringScope(accessor); assert accessorDeclaringScope != null : "Scope for accessor " + accessor.getText() + " should exists"; - LexicalScope headerScope = JetScopeUtils.makeScopeForPropertyHeader(accessorDeclaringScope, descriptor); + LexicalScope headerScope = ScopeUtils.makeScopeForPropertyHeader(accessorDeclaringScope, descriptor); return new LexicalScopeImpl(headerScope, descriptor, true, descriptor.getExtensionReceiverParameter(), LexicalScopeKind.PROPERTY_ACCESSOR_BODY); } @@ -706,9 +706,9 @@ public class BodyResolver { trace.report(ACCESSOR_FOR_DELEGATED_PROPERTY.on(setter)); } - LexicalScope delegateFunctionsScope = JetScopeUtils.makeScopeForDelegateConventionFunctions(propertyHeaderScope, propertyDescriptor); + LexicalScope delegateFunctionsScope = ScopeUtils.makeScopeForDelegateConventionFunctions(propertyHeaderScope, propertyDescriptor); - LexicalScope initializerScope = JetScopeUtils.makeScopeForPropertyInitializer(propertyHeaderScope, propertyDescriptor); + LexicalScope initializerScope = ScopeUtils.makeScopeForPropertyInitializer(propertyHeaderScope, propertyDescriptor); KotlinType delegateType = delegatedPropertyResolver.resolveDelegateExpression( delegateExpression, property, propertyDescriptor, initializerScope, trace, @@ -733,7 +733,7 @@ public class BodyResolver { @NotNull KtExpression initializer, @NotNull LexicalScope propertyHeader ) { - LexicalScope propertyDeclarationInnerScope = JetScopeUtils.makeScopeForPropertyInitializer(propertyHeader, propertyDescriptor); + LexicalScope propertyDeclarationInnerScope = ScopeUtils.makeScopeForPropertyInitializer(propertyHeader, propertyDescriptor); KotlinType expectedTypeForInitializer = property.getTypeReference() != null ? propertyDescriptor.getType() : NO_EXPECTED_TYPE; if (propertyDescriptor.getCompileTimeInitializer() == null) { expressionTypingServices.getType(propertyDeclarationInnerScope, initializer, expectedTypeForInitializer, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java index 4cc97629d1e..963fea4f208 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java @@ -33,10 +33,8 @@ import org.jetbrains.kotlin.resolve.calls.inference.TypeVariableKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.kotlin.resolve.scopes.JetScopeUtils; +import org.jetbrains.kotlin.resolve.scopes.ScopeUtils; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; -import org.jetbrains.kotlin.resolve.scopes.LexicalScopeImpl; -import org.jetbrains.kotlin.resolve.scopes.LexicalScopeKind; import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.kotlin.resolve.validation.OperatorValidator; import org.jetbrains.kotlin.resolve.validation.SymbolUsageValidator; @@ -349,7 +347,7 @@ public class DelegatedPropertyResolver { @NotNull LexicalScope scopeForDelegate, @NotNull final BindingTrace trace ) { - final LexicalScope delegateFunctionsScope = JetScopeUtils.makeScopeForDelegateConventionFunctions(scopeForDelegate, propertyDescriptor); + final LexicalScope delegateFunctionsScope = ScopeUtils.makeScopeForDelegateConventionFunctions(scopeForDelegate, propertyDescriptor); final KotlinType expectedType = property.getTypeReference() != null ? propertyDescriptor.getType() : NO_EXPECTED_TYPE; return new ConstraintSystemCompleter() { @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 49549ee6d1b..4291c4d844c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -47,7 +47,7 @@ import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsKt; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; -import org.jetbrains.kotlin.resolve.scopes.JetScopeUtils; +import org.jetbrains.kotlin.resolve.scopes.ScopeUtils; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.resolve.scopes.LexicalScopeKind; import org.jetbrains.kotlin.resolve.scopes.LexicalWritableScope; @@ -825,7 +825,7 @@ public class DescriptorResolver { DescriptorFactory.createExtensionReceiverParameterForCallable(propertyDescriptor, receiverType); KotlinType type = getVariableType(propertyDescriptor, - JetScopeUtils.makeScopeForPropertyInitializer(scopeWithTypeParameters, propertyDescriptor), + ScopeUtils.makeScopeForPropertyInitializer(scopeWithTypeParameters, propertyDescriptor), property, dataFlowInfo, true, trace); propertyDescriptor.setType(type, typeParameterDescriptors, getDispatchReceiverParameterIfNeeded(containingDeclaration), @@ -970,7 +970,7 @@ public class DescriptorResolver { delegateExpression, property, propertyDescriptor, scopeForInitializer, trace, dataFlowInfo); if (type != null) { - LexicalScope delegateFunctionsScope = JetScopeUtils.makeScopeForDelegateConventionFunctions(scopeForInitializer, propertyDescriptor); + LexicalScope delegateFunctionsScope = ScopeUtils.makeScopeForDelegateConventionFunctions(scopeForInitializer, propertyDescriptor); KotlinType getterReturnType = delegatedPropertyResolver .getDelegatedPropertyGetMethodReturnType(propertyDescriptor, delegateExpression, type, trace, delegateFunctionsScope); if (getterReturnType != null) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt index 065fc961cea..93a238b9533 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsUtil import org.jetbrains.kotlin.resolve.calls.util.CallMaker import org.jetbrains.kotlin.resolve.scopes.BaseLexicalScope -import org.jetbrains.kotlin.resolve.scopes.JetScopeUtils +import org.jetbrains.kotlin.resolve.scopes.ScopeUtils import org.jetbrains.kotlin.resolve.scopes.LexicalScopeKind import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue @@ -149,7 +149,7 @@ public fun resolvePossiblyAmbiguousCallableReference( if (possibleStatic.isSomething()) return possibleStatic val possibleNested = resolveInScope("trace to resolve ::${reference.getReferencedName()} in static nested classes scope", - classifier, JetScopeUtils.getStaticNestedClassesScope(classifier)) + classifier, ScopeUtils.getStaticNestedClassesScope(classifier)) if (possibleNested.isSomething()) return possibleNested val possibleWithReceiver = resolveWithReceiver("trace to resolve ::${reference.getReferencedName()} with receiver", diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java index 7d5f4ce9a75..2a23988d64a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java @@ -34,9 +34,9 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.*; -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo; -import org.jetbrains.kotlin.resolve.lazy.data.JetClassOrObjectInfo; -import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo; +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo; +import org.jetbrains.kotlin.resolve.lazy.data.KtClassOrObjectInfo; +import org.jetbrains.kotlin.resolve.lazy.data.KtScriptInfo; import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyAnnotations; @@ -242,15 +242,15 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext { return ContainerUtil.mapNotNull( provider.getClassOrObjectDeclarations(fqName.shortName()), - new Function() { + new Function() { @Override - public ClassDescriptor fun(JetClassLikeInfo classLikeInfo) { - if (classLikeInfo instanceof JetClassOrObjectInfo) { + public ClassDescriptor fun(KtClassLikeInfo classLikeInfo) { + if (classLikeInfo instanceof KtClassOrObjectInfo) { //noinspection RedundantCast - return getClassDescriptor(((JetClassOrObjectInfo) classLikeInfo).getCorrespondingClassOrObject(), location); + return getClassDescriptor(((KtClassOrObjectInfo) classLikeInfo).getCorrespondingClassOrObject(), location); } - else if (classLikeInfo instanceof JetScriptInfo) { - return getScriptDescriptor(((JetScriptInfo) classLikeInfo).getScript()); + else if (classLikeInfo instanceof KtScriptInfo) { + return getScriptDescriptor(((KtScriptInfo) classLikeInfo).getScript()); } else { throw new IllegalStateException( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassInfo.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassInfo.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassInfo.java index 1c942645610..c81610cddb9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassInfo.java @@ -23,10 +23,10 @@ import org.jetbrains.kotlin.psi.KtClass; import org.jetbrains.kotlin.psi.KtEnumEntry; import org.jetbrains.kotlin.psi.KtTypeParameterList; -public class JetClassInfo extends JetClassOrObjectInfo { +public class KtClassInfo extends KtClassOrObjectInfo { private final ClassKind kind; - protected JetClassInfo(@NotNull KtClass classOrObject) { + protected KtClassInfo(@NotNull KtClass classOrObject) { super(classOrObject); if (element instanceof KtEnumEntry) { this.kind = ClassKind.ENUM_ENTRY; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassInfoUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassInfoUtil.java similarity index 80% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassInfoUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassInfoUtil.java index f2b205a0d93..df5149e14ee 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassInfoUtil.java @@ -21,15 +21,15 @@ import org.jetbrains.kotlin.psi.KtClass; import org.jetbrains.kotlin.psi.KtClassOrObject; import org.jetbrains.kotlin.psi.KtObjectDeclaration; -public class JetClassInfoUtil { +public class KtClassInfoUtil { @NotNull - public static JetClassLikeInfo createClassLikeInfo(@NotNull KtClassOrObject classOrObject) { + public static KtClassLikeInfo createClassLikeInfo(@NotNull KtClassOrObject classOrObject) { if (classOrObject instanceof KtClass) { - return new JetClassInfo((KtClass) classOrObject); + return new KtClassInfo((KtClass) classOrObject); } if (classOrObject instanceof KtObjectDeclaration) { - return new JetObjectInfo((KtObjectDeclaration) classOrObject); + return new KtObjectInfo((KtObjectDeclaration) classOrObject); } throw new IllegalArgumentException("Unknown declaration type: " + classOrObject + classOrObject.getText()); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassLikeInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassLikeInfo.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassLikeInfo.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassLikeInfo.java index ddc4d3caaa5..a43eaf0da29 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassLikeInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassLikeInfo.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.*; import java.util.List; -public interface JetClassLikeInfo extends KtDeclarationContainer { +public interface KtClassLikeInfo extends KtDeclarationContainer { @NotNull FqName getContainingPackageFqName(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassOrObjectInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassOrObjectInfo.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java index fced90bcd81..3ab3dceb333 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetClassOrObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java @@ -27,10 +27,10 @@ import org.jetbrains.kotlin.psi.*; import java.util.Collections; import java.util.List; -public abstract class JetClassOrObjectInfo implements JetClassLikeInfo { +public abstract class KtClassOrObjectInfo implements KtClassLikeInfo { protected final E element; - protected JetClassOrObjectInfo(@NotNull E element) { + protected KtClassOrObjectInfo(@NotNull E element) { this.element = element; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtObjectInfo.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtObjectInfo.java index de04ede0efa..bcd2b787284 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtObjectInfo.java @@ -23,11 +23,11 @@ import org.jetbrains.kotlin.psi.KtObjectDeclaration; import org.jetbrains.kotlin.psi.KtTypeParameterList; import org.jetbrains.kotlin.resolve.ModifiersChecker; -public class JetObjectInfo extends JetClassOrObjectInfo { +public class KtObjectInfo extends KtClassOrObjectInfo { @NotNull private final ClassKind kind; - protected JetObjectInfo(@NotNull KtObjectDeclaration element) { + protected KtObjectInfo(@NotNull KtObjectDeclaration element) { super(element); this.kind = element.isObjectLiteral() ? ClassKind.CLASS : ClassKind.OBJECT; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtScriptInfo.kt similarity index 96% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtScriptInfo.kt index 6c6a6c1dc39..4c7afb60013 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtScriptInfo.kt @@ -22,9 +22,9 @@ import org.jetbrains.kotlin.psi.KtObjectDeclaration import org.jetbrains.kotlin.psi.KtParameter import org.jetbrains.kotlin.psi.KtScript -public class JetScriptInfo( +public class KtScriptInfo( val script: KtScript -) : JetClassLikeInfo { +) : KtClassLikeInfo { override fun getContainingPackageFqName() = script.fqName.parent() override fun getModifierList() = null override fun getCompanionObjects() = listOf() diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt index d21633c6b6e..8e7dc098753 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt @@ -21,9 +21,9 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils.safeNameForLazyResolve -import org.jetbrains.kotlin.resolve.lazy.data.JetClassInfoUtil -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo -import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo +import org.jetbrains.kotlin.resolve.lazy.data.KtClassInfoUtil +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo +import org.jetbrains.kotlin.resolve.lazy.data.KtScriptInfo import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.storage.StorageManager import java.util.* @@ -35,7 +35,7 @@ public abstract class AbstractPsiBasedDeclarationProvider(storageManager: Storag val allDeclarations = ArrayList() val functions = ArrayListMultimap.create() val properties = ArrayListMultimap.create() - val classesAndObjects = ArrayListMultimap.create() // order matters here + val classesAndObjects = ArrayListMultimap.create() // order matters here public fun putToIndex(declaration: KtDeclaration) { if (declaration is KtAnonymousInitializer || declaration is KtSecondaryConstructor) return @@ -48,10 +48,10 @@ public abstract class AbstractPsiBasedDeclarationProvider(storageManager: Storag properties.put(safeNameForLazyResolve(declaration), declaration) } else if (declaration is KtClassOrObject) { - classesAndObjects.put(safeNameForLazyResolve(declaration.getNameAsName()), JetClassInfoUtil.createClassLikeInfo(declaration)) + classesAndObjects.put(safeNameForLazyResolve(declaration.getNameAsName()), KtClassInfoUtil.createClassLikeInfo(declaration)) } else if (declaration is KtScript) { - val scriptInfo = JetScriptInfo(declaration) + val scriptInfo = KtScriptInfo(declaration) classesAndObjects.put(scriptInfo.script.nameAsName, scriptInfo) } else if (declaration is KtParameter || declaration is KtTypedef || declaration is KtDestructuringDeclaration) { @@ -80,6 +80,6 @@ public abstract class AbstractPsiBasedDeclarationProvider(storageManager: Storag override fun getPropertyDeclarations(name: Name): List = index().properties[ResolveSessionUtils.safeNameForLazyResolve(name)].toList() - override fun getClassOrObjectDeclarations(name: Name): Collection + override fun getClassOrObjectDeclarations(name: Name): Collection = index().classesAndObjects[ResolveSessionUtils.safeNameForLazyResolve(name)] } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/ClassMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/ClassMemberDeclarationProvider.kt index 47ddc75405e..2b15daf3252 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/ClassMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/ClassMemberDeclarationProvider.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.resolve.lazy.declarations -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo public interface ClassMemberDeclarationProvider : DeclarationProvider { - public fun getOwnerInfo(): JetClassLikeInfo + public fun getOwnerInfo(): KtClassLikeInfo } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProvider.kt index 7cf02985f4f..b9210cddcd5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProvider.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.resolve.lazy.declarations import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.kotlin.psi.KtProperty -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter @@ -30,5 +30,5 @@ public interface DeclarationProvider { public fun getPropertyDeclarations(name: Name): Collection - public fun getClassOrObjectDeclarations(name: Name): Collection + public fun getClassOrObjectDeclarations(name: Name): Collection } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java index 95ec053a582..bc018ca90bc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.resolve.lazy.declarations; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo; +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo; public interface DeclarationProviderFactory { @NotNull - ClassMemberDeclarationProvider getClassMemberDeclarationProvider(@NotNull JetClassLikeInfo classLikeInfo); + ClassMemberDeclarationProvider getClassMemberDeclarationProvider(@NotNull KtClassLikeInfo classLikeInfo); @Nullable PackageMemberDeclarationProvider getPackageMemberDeclarationProvider(@NotNull FqName packageFqName); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java index d4a562738f7..fcfd966349d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo; +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; @@ -98,7 +98,7 @@ public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProv @NotNull @Override - public ClassMemberDeclarationProvider getClassMemberDeclarationProvider(@NotNull JetClassLikeInfo classLikeInfo) { + public ClassMemberDeclarationProvider getClassMemberDeclarationProvider(@NotNull KtClassLikeInfo classLikeInfo) { if (!index.invoke().filesByPackage.containsKey(classLikeInfo.getContainingPackageFqName())) { throw new IllegalStateException("This factory doesn't know about this class: " + classLikeInfo); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt index ae1f6b426a0..56d4cad1c39 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.resolve.lazy.declarations import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo public class PsiBasedClassMemberDeclarationProvider( storageManager: StorageManager, - private val classInfo: JetClassLikeInfo) + private val classInfo: KtClassLikeInfo) : AbstractPsiBasedDeclarationProvider(storageManager), ClassMemberDeclarationProvider { override fun getOwnerInfo() = classInfo diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index d6d5d53832a..4719f2e4586 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.lazy.LazyClassContext import org.jetbrains.kotlin.resolve.lazy.ResolveSession -import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo +import org.jetbrains.kotlin.resolve.lazy.data.KtScriptInfo import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProvider import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.LexicalScope @@ -54,7 +54,7 @@ protected constructor( private fun resolveClassDescriptor(name: Name): List { return declarationProvider.getClassOrObjectDeclarations(name).map { - if (it is JetScriptInfo) + if (it is KtScriptInfo) LazyScriptDescriptor(c as ResolveSession, thisDescriptor, name, it) else LazyClassDescriptor(c, thisDescriptor, name, it) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java index 029dbc6ce3f..40b603a7994 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -41,10 +41,10 @@ import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.lazy.LazyClassContext; import org.jetbrains.kotlin.resolve.lazy.LazyEntity; -import org.jetbrains.kotlin.resolve.lazy.data.JetClassInfoUtil; -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo; -import org.jetbrains.kotlin.resolve.lazy.data.JetClassOrObjectInfo; -import org.jetbrains.kotlin.resolve.lazy.data.JetObjectInfo; +import org.jetbrains.kotlin.resolve.lazy.data.KtClassInfoUtil; +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo; +import org.jetbrains.kotlin.resolve.lazy.data.KtClassOrObjectInfo; +import org.jetbrains.kotlin.resolve.lazy.data.KtObjectInfo; import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider; import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; @@ -107,7 +107,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes @NotNull final LazyClassContext c, @NotNull DeclarationDescriptor containingDeclaration, @NotNull Name name, - @NotNull JetClassLikeInfo classLikeInfo + @NotNull KtClassLikeInfo classLikeInfo ) { super(c.getStorageManager(), containingDeclaration, name, KotlinSourceElementKt.toSourceElement(classLikeInfo.getCorrespondingClassOrObject()) @@ -128,7 +128,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes this.typeConstructor = new LazyClassTypeConstructor(); final ClassKind syntaxKind = classLikeInfo.getClassKind(); - this.isCompanionObject = classLikeInfo instanceof JetObjectInfo && ((JetObjectInfo) classLikeInfo).isCompanionObject(); + this.isCompanionObject = classLikeInfo instanceof KtObjectInfo && ((KtObjectInfo) classLikeInfo).isCompanionObject(); final KtModifierList modifierList = classLikeInfo.getModifierList(); if (syntaxKind.isSingleton()) { @@ -244,7 +244,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes this.parameters = c.getStorageManager().createLazyValue(new Function0>() { @Override public List invoke() { - JetClassLikeInfo classInfo = declarationProvider.getOwnerInfo(); + KtClassLikeInfo classInfo = declarationProvider.getOwnerInfo(); KtTypeParameterList typeParameterList = classInfo.getTypeParameterList(); if (typeParameterList == null) return Collections.emptyList(); @@ -386,11 +386,11 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes @Nullable private LazyClassDescriptor computeCompanionObjectDescriptor(@Nullable KtObjectDeclaration companionObject) { - JetClassLikeInfo companionObjectInfo = getCompanionObjectInfo(companionObject); - if (!(companionObjectInfo instanceof JetClassOrObjectInfo)) { + KtClassLikeInfo companionObjectInfo = getCompanionObjectInfo(companionObject); + if (!(companionObjectInfo instanceof KtClassOrObjectInfo)) { return null; } - Name name = ((JetClassOrObjectInfo) companionObjectInfo).getName(); + Name name = ((KtClassOrObjectInfo) companionObjectInfo).getName(); assert name != null; getUnsubstitutedMemberScope().getContributedClassifier(name, NoLookupLocation.WHEN_GET_COMPANION_OBJECT); ClassDescriptor companionObjectDescriptor = c.getTrace().get(BindingContext.CLASS, companionObject); @@ -404,9 +404,9 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes } @Nullable - private static JetClassLikeInfo getCompanionObjectInfo(@Nullable KtObjectDeclaration companionObject) { + private static KtClassLikeInfo getCompanionObjectInfo(@Nullable KtObjectDeclaration companionObject) { if (companionObject != null) { - return JetClassInfoUtil.createClassLikeInfo(companionObject); + return KtClassInfoUtil.createClassLikeInfo(companionObject); } return null; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt index 33db68ce90d..4bf19066d26 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.lazy.LazyClassContext import org.jetbrains.kotlin.resolve.lazy.ResolveSession -import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo +import org.jetbrains.kotlin.resolve.lazy.data.KtScriptInfo import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider import org.jetbrains.kotlin.resolve.source.toSourceElement import org.jetbrains.kotlin.script.ScriptPriorities @@ -33,7 +33,7 @@ public class LazyScriptDescriptor( private val resolveSession: ResolveSession, containingDeclaration: DeclarationDescriptor, name: Name, - internal val scriptInfo: JetScriptInfo + internal val scriptInfo: KtScriptInfo ) : ScriptDescriptor, LazyClassDescriptor( resolveSession, containingDeclaration, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/ScopeUtils.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/ScopeUtils.java index 3c3f5925f6f..8e9a0b054ac 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/ScopeUtils.java @@ -24,8 +24,8 @@ import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.utils.Printer; -public final class JetScopeUtils { - private JetScopeUtils() {} +public final class ScopeUtils { + private ScopeUtils() {} @NotNull public static MemberScope getStaticNestedClassesScope(@NotNull ClassDescriptor descriptor) { 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 daf71f48868..183ca6e922a 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 @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.descriptorUtil.classValueType import org.jetbrains.kotlin.resolve.scopes.ChainedScope import org.jetbrains.kotlin.resolve.scopes.FilteringScope -import org.jetbrains.kotlin.resolve.scopes.JetScopeUtils +import org.jetbrains.kotlin.resolve.scopes.ScopeUtils import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.utils.addIfNotNull import java.util.* @@ -125,7 +125,7 @@ class ClassQualifier( scopes.add(classifier.staticScope) if (classifier.kind != ClassKind.ENUM_ENTRY) { - scopes.add(JetScopeUtils.getStaticNestedClassesScope(classifier)) + scopes.add(ScopeUtils.getStaticNestedClassesScope(classifier)) } return ChainedScope("Static scope for $name as class or object", *scopes.toTypedArray()) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt index 62e88c33602..42be7b84788 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt @@ -35,8 +35,8 @@ import org.jetbrains.kotlin.psi.debugText.getDebugText import org.jetbrains.kotlin.resolve.* import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.kotlin.resolve.lazy.* -import org.jetbrains.kotlin.resolve.lazy.data.JetClassInfoUtil -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo +import org.jetbrains.kotlin.resolve.lazy.data.KtClassInfoUtil +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider @@ -125,7 +125,7 @@ class LocalClassDescriptorHolder( override val functionDescriptorResolver = this@LocalClassDescriptorHolder.functionDescriptorResolver override val typeResolver = this@LocalClassDescriptorHolder.typeResolver override val declarationProviderFactory = object : DeclarationProviderFactory { - override fun getClassMemberDeclarationProvider(classLikeInfo: JetClassLikeInfo): ClassMemberDeclarationProvider { + override fun getClassMemberDeclarationProvider(classLikeInfo: KtClassLikeInfo): ClassMemberDeclarationProvider { return PsiBasedClassMemberDeclarationProvider(storageManager, classLikeInfo) } @@ -141,7 +141,7 @@ class LocalClassDescriptorHolder( , containingDeclaration, classOrObject.getNameAsSafeName(), - JetClassInfoUtil.createClassLikeInfo(classOrObject) + KtClassInfoUtil.createClassLikeInfo(classOrObject) ) writableScope?.addClassifierDescriptor(classDescriptor!!) } 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 a54413083d8..c683907d821 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 @@ -167,7 +167,7 @@ public fun getResolutionScope(resolutionFacade: ResolutionFacade, descriptor: De descriptor, RedeclarationHandler.DO_NOTHING) is PropertyDescriptor -> - JetScopeUtils.makeScopeForPropertyHeader(getOuterScope(descriptor, resolutionFacade), descriptor) + ScopeUtils.makeScopeForPropertyHeader(getOuterScope(descriptor, resolutionFacade), descriptor) is DeclarationDescriptorNonRoot -> getOuterScope(descriptor, resolutionFacade) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactory.kt index 9dc6f5c9cf1..07cc262b375 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactory.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex.resolve import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo import org.jetbrains.kotlin.resolve.lazy.declarations.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.storage.StorageManager @@ -33,7 +33,7 @@ public class PluginDeclarationProviderFactory( ) : AbstractDeclarationProviderFactory(storageManager) { private val fileBasedDeclarationProviderFactory = FileBasedDeclarationProviderFactory(storageManager, nonIndexedFiles) - override fun getClassMemberDeclarationProvider(classLikeInfo: JetClassLikeInfo): ClassMemberDeclarationProvider { + override fun getClassMemberDeclarationProvider(classLikeInfo: KtClassLikeInfo): ClassMemberDeclarationProvider { return PsiBasedClassMemberDeclarationProvider(storageManager, classLikeInfo) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt index c540224bb64..f4064beeaa6 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt @@ -22,14 +22,14 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo -import org.jetbrains.kotlin.resolve.lazy.data.JetClassInfoUtil +import org.jetbrains.kotlin.resolve.lazy.data.KtClassLikeInfo +import org.jetbrains.kotlin.resolve.lazy.data.KtClassInfoUtil import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils import java.util.ArrayList import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import com.intellij.psi.stubs.StringStubIndexExtension import org.jetbrains.kotlin.idea.stubindex.* -import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo +import org.jetbrains.kotlin.resolve.lazy.data.KtScriptInfo public class StubBasedPackageMemberDeclarationProvider( private val fqName: FqName, @@ -59,13 +59,13 @@ public class StubBasedPackageMemberDeclarationProvider( return result } - override fun getClassOrObjectDeclarations(name: Name): Collection { - val result = ArrayList() + override fun getClassOrObjectDeclarations(name: Name): Collection { + val result = ArrayList() KotlinFullClassNameIndex.getInstance().get(childName(name), project, searchScope) - .mapTo(result) { JetClassInfoUtil.createClassLikeInfo(it) } + .mapTo(result) { KtClassInfoUtil.createClassLikeInfo(it) } KotlinScriptFqnIndex.instance.get(childName(name), project, searchScope) - .mapTo(result) { JetScriptInfo(it) } + .mapTo(result) { KtScriptInfo(it) } return result } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt index fc1b39a6430..ba49a8fa681 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt @@ -259,7 +259,7 @@ object ReplaceWithAnnotationAnalyzer { is PropertyDescriptor -> { val outerScope = getResolutionScope(descriptor.containingDeclaration, ownerDescriptor, additionalScopes) ?: return null - val propertyHeader = JetScopeUtils.makeScopeForPropertyHeader(outerScope, descriptor) + val propertyHeader = ScopeUtils.makeScopeForPropertyHeader(outerScope, descriptor) LexicalScopeImpl(propertyHeader, descriptor, false, descriptor.extensionReceiverParameter, LexicalScopeKind.PROPERTY_ACCESSOR_BODY) }