azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Location.NOWHERE -> UsageLocation.NO_LOCATION

Browse Source
This commit is contained in:
Zalim Bashorov
2015-07-15 14:29:56 +03:00
parent e2e3520c3d
commit 41449c107e
50 changed files with 153 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt
+2 -2
View File
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.DescriptorFactory
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.Location
import org.jetbrains.kotlin.resolve.scopes.UsageLocation
import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.utils.*
@@ -285,7 +285,7 @@ public class LazyJavaClassMemberScope(
override fun getDispatchReceiverParameter(): ReceiverParameterDescriptor? =
DescriptorUtils.getDispatchReceiverParameterIfNeeded(getContainingDeclaration())
override fun getClassifier(name: Name, location: Location): ClassifierDescriptor? = nestedClasses(name)
override fun getClassifier(name: Name, location: UsageLocation): ClassifierDescriptor? = nestedClasses(name)
override fun getClassNames(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<Name>
= nestedClassIndex().keySet() + enumEntryIndex().keySet()
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt
+3 -3
View File
@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude.NonExtensions
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.resolve.scopes.JetScopeImpl
import org.jetbrains.kotlin.resolve.scopes.Location
import org.jetbrains.kotlin.resolve.scopes.UsageLocation
import org.jetbrains.kotlin.storage.NotNullLazyValue
import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.types.TypeUtils
@@ -218,7 +218,7 @@ public abstract class LazyJavaMemberScope(
return ResolvedValueParameters(descriptors, synthesizedNames)
}
override fun getFunctions(name: Name, location: Location) = functions(name)
override fun getFunctions(name: Name, location: UsageLocation) = functions(name)
protected open fun getFunctionNames(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<Name>
= memberIndex().getMethodNames(nameFilter)
@@ -297,7 +297,7 @@ public abstract class LazyJavaMemberScope(
return propertyType
}
override fun getProperties(name: Name, location: Location): Collection<VariableDescriptor> = properties(name)
override fun getProperties(name: Name, location: UsageLocation): Collection<VariableDescriptor> = properties(name)
override fun getOwnDeclaredDescriptors() = getDescriptors()
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt
+2 -2
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.DescriptorFactory.createEnumValueOfMethod
import org.jetbrains.kotlin.resolve.DescriptorFactory.createEnumValuesMethod
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.Location
import org.jetbrains.kotlin.resolve.scopes.UsageLocation
import org.jetbrains.kotlin.utils.addIfNotNull
public class LazyJavaStaticClassScope(
@@ -58,7 +58,7 @@ public class LazyJavaStaticClassScope(
memberIndex().getAllFieldNames()
override fun getClassNames(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): Collection<Name> = listOf()
override fun getClassifier(name: Name, location: Location): ClassifierDescriptor? = null
override fun getClassifier(name: Name, location: UsageLocation): ClassifierDescriptor? = null
override fun getSubPackages(): Collection<FqName> = listOf()
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt
+4 -4
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.SpecialNames
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.resolve.scopes.Location
import org.jetbrains.kotlin.resolve.scopes.UsageLocation
import org.jetbrains.kotlin.utils.addIfNotNull
public class LazyPackageFragmentScopeForJavaPackage(
@@ -70,10 +70,10 @@ public class LazyPackageFragmentScopeForJavaPackage(
}
}
override fun getClassifier(name: Name, location: Location): ClassifierDescriptor? = classes(name)
override fun getClassifier(name: Name, location: UsageLocation): ClassifierDescriptor? = classes(name)
override fun getProperties(name: Name, location: Location) = deserializedPackageScope().getProperties(name)
override fun getFunctions(name: Name, location: Location) = deserializedPackageScope().getFunctions(name) + super.getFunctions(name)
override fun getProperties(name: Name, location: UsageLocation) = deserializedPackageScope().getProperties(name)
override fun getFunctions(name: Name, location: UsageLocation) = deserializedPackageScope().getFunctions(name) + super.getFunctions(name)
override fun addExtraDescriptors(result: MutableSet<DeclarationDescriptor>,
kindFilter: DescriptorKindFilter,
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+3 -3
View File
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.constants.ConstantValue;
import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.kotlin.resolve.scopes.Location;
import org.jetbrains.kotlin.resolve.scopes.UsageLocation;
import org.jetbrains.kotlin.storage.LockBasedStorageManager;
import org.jetbrains.kotlin.types.*;
import org.jetbrains.kotlin.types.checker.JetTypeChecker;
@@ -252,7 +252,7 @@ public class KotlinBuiltIns {
@Nullable
public ClassDescriptor getBuiltInClassByNameNullable(@NotNull Name simpleName) {
ClassifierDescriptor classifier = getBuiltInsPackageFragment().getMemberScope().getClassifier(simpleName, Location.NOWHERE);
ClassifierDescriptor classifier = getBuiltInsPackageFragment().getMemberScope().getClassifier(simpleName, UsageLocation.NO_LOCATION);
assert classifier == null ||
classifier instanceof ClassDescriptor : "Must be a class descriptor " + simpleName + ", but was " + classifier;
return (ClassDescriptor) classifier;
@@ -1019,6 +1019,6 @@ public class KotlinBuiltIns {
@NotNull
public FunctionDescriptor getIdentityEquals() {
return KotlinPackage.first(getBuiltInsPackageFragment().getMemberScope().getFunctions(Name.identifier("identityEquals"), Location.NOWHERE));
return KotlinPackage.first(getBuiltInsPackageFragment().getMemberScope().getFunctions(Name.identifier("identityEquals"), UsageLocation.NO_LOCATION));
}
}
core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassScope.kt
+3 -3
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.OverridingUtil
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.JetScopeImpl
import org.jetbrains.kotlin.resolve.scopes.Location
import org.jetbrains.kotlin.resolve.scopes.UsageLocation
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.utils.Printer
import org.jetbrains.kotlin.utils.toReadOnlyList
@@ -48,11 +48,11 @@ class FunctionClassScope(
return allDescriptors()
}
override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor> {
override fun getFunctions(name: Name, location: UsageLocation): Collection<FunctionDescriptor> {
return allDescriptors().filterIsInstance<FunctionDescriptor>().filter { it.getName() == name }
}
override fun getProperties(name: Name, location: Location): Collection<VariableDescriptor> {
override fun getProperties(name: Name, location: UsageLocation): Collection<VariableDescriptor> {
return allDescriptors().filterIsInstance<PropertyDescriptor>().filter { it.getName() == name }
}
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java
+6 -6
View File
@@ -192,25 +192,25 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
@NotNull
@Override
@SuppressWarnings("unchecked")
public Collection<VariableDescriptor> getProperties(@NotNull Name name, @NotNull Location location) {
public Collection<VariableDescriptor> getProperties(@NotNull Name name, @NotNull UsageLocation location) {
return (Collection) properties.invoke(name);
}
@NotNull
@SuppressWarnings("unchecked")
private Collection<PropertyDescriptor> computeProperties(@NotNull Name name) {
return resolveFakeOverrides(name, (Collection) getSupertypeScope().getProperties(name, Location.NOWHERE));
return resolveFakeOverrides(name, (Collection) getSupertypeScope().getProperties(name, UsageLocation.NO_LOCATION));
}
@NotNull
@Override
public Collection<FunctionDescriptor> getFunctions(@NotNull Name name, @NotNull Location location) {
public Collection<FunctionDescriptor> getFunctions(@NotNull Name name, @NotNull UsageLocation location) {
return functions.invoke(name);
}
@NotNull
private Collection<FunctionDescriptor> computeFunctions(@NotNull Name name) {
return resolveFakeOverrides(name, getSupertypeScope().getFunctions(name, Location.NOWHERE));
return resolveFakeOverrides(name, getSupertypeScope().getFunctions(name, UsageLocation.NO_LOCATION));
}
@NotNull
@@ -266,8 +266,8 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
private Collection<DeclarationDescriptor> computeAllDeclarations() {
Collection<DeclarationDescriptor> result = new HashSet<DeclarationDescriptor>();
for (Name name : enumMemberNames.invoke()) {
result.addAll(getFunctions(name, Location.NOWHERE));
result.addAll(getProperties(name, Location.NOWHERE));
result.addAll(getFunctions(name, UsageLocation.NO_LOCATION));
result.addAll(getProperties(name, UsageLocation.NO_LOCATION));
}
return result;
}
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+2 -2
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.name.SpecialNames;
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter;
import org.jetbrains.kotlin.resolve.scopes.FilteringScope;
import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.kotlin.resolve.scopes.Location;
import org.jetbrains.kotlin.resolve.scopes.UsageLocation;
import org.jetbrains.kotlin.types.ErrorUtils;
import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.LazyType;
@@ -389,7 +389,7 @@ public class DescriptorUtils {
@Nullable
public static ClassDescriptor getInnerClassByName(@NotNull ClassDescriptor classDescriptor, @NotNull String innerClassName) {
ClassifierDescriptor classifier =
classDescriptor.getDefaultType().getMemberScope().getClassifier(Name.identifier(innerClassName), Location.NOWHERE);
classDescriptor.getDefaultType().getMemberScope().getClassifier(Name.identifier(innerClassName), UsageLocation.NO_LOCATION);
assert classifier instanceof ClassDescriptor :
"Inner class " + innerClassName + " in " + classDescriptor + " should be instance of ClassDescriptor, but was: "
+ (classifier == null ? "null" : classifier.getClass());
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/AbstractScopeAdapter.kt
+3 -3
View File
@@ -31,7 +31,7 @@ public abstract class AbstractScopeAdapter : JetScope {
return workerScope.getImplicitReceiversHierarchy()
}
override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor> {
override fun getFunctions(name: Name, location: UsageLocation): Collection<FunctionDescriptor> {
return workerScope.getFunctions(name)
}
@@ -39,11 +39,11 @@ public abstract class AbstractScopeAdapter : JetScope {
return workerScope.getPackage(name)
}
override fun getClassifier(name: Name, location: Location): ClassifierDescriptor? {
override fun getClassifier(name: Name, location: UsageLocation): ClassifierDescriptor? {
return workerScope.getClassifier(name)
}
override fun getProperties(name: Name, location: Location): Collection<VariableDescriptor> {
override fun getProperties(name: Name, location: UsageLocation): Collection<VariableDescriptor> {
return workerScope.getProperties(name)
}
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ChainedScope.kt
+3 -3
View File
@@ -50,19 +50,19 @@ public open class ChainedScope(
return result ?: emptySet()
}
override fun getClassifier(name: Name, location: Location): ClassifierDescriptor?
override fun getClassifier(name: Name, location: UsageLocation): ClassifierDescriptor?
= getFirstMatch { it.getClassifier(name) }
override fun getPackage(name: Name): PackageViewDescriptor?
= getFirstMatch { it.getPackage(name) }
override fun getProperties(name: Name, location: Location): Collection<VariableDescriptor>
override fun getProperties(name: Name, location: UsageLocation): Collection<VariableDescriptor>
= getFromAllScopes { it.getProperties(name) }
override fun getLocalVariable(name: Name): VariableDescriptor?
= getFirstMatch { it.getLocalVariable(name) }
override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor>
override fun getFunctions(name: Name, location: UsageLocation): Collection<FunctionDescriptor>
= getFromAllScopes { it.getFunctions(name) }
override fun getSyntheticExtensionProperties(receiverTypes: Collection<JetType>, name: Name): Collection<PropertyDescriptor>
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ExplicitImportsScope.kt
+3 -3
View File
@@ -23,13 +23,13 @@ import org.jetbrains.kotlin.utils.Printer
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
public class ExplicitImportsScope(private val descriptors: Collection<DeclarationDescriptor>) : JetScopeImpl() {
override fun getClassifier(name: Name, location: Location) = descriptors.filter { it.getName() == name }.firstIsInstanceOrNull<ClassifierDescriptor>()
override fun getClassifier(name: Name, location: UsageLocation) = descriptors.filter { it.getName() == name }.firstIsInstanceOrNull<ClassifierDescriptor>()
override fun getPackage(name: Name)= descriptors.filter { it.getName() == name }.firstIsInstanceOrNull<PackageViewDescriptor>()
override fun getProperties(name: Name, location: Location) = descriptors.filter { it.getName() == name }.filterIsInstance<VariableDescriptor>()
override fun getProperties(name: Name, location: UsageLocation) = descriptors.filter { it.getName() == name }.filterIsInstance<VariableDescriptor>()
override fun getFunctions(name: Name, location: Location) = descriptors.filter { it.getName() == name }.filterIsInstance<FunctionDescriptor>()
override fun getFunctions(name: Name, location: UsageLocation) = descriptors.filter { it.getName() == name }.filterIsInstance<FunctionDescriptor>()
override fun getContainingDeclaration() = throw UnsupportedOperationException()
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/FilteringScope.kt
+3 -3
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.utils.Printer
public class FilteringScope(private val workerScope: JetScope, private val predicate: (DeclarationDescriptor) -> Boolean) : JetScope {
override fun getFunctions(name: Name, location: Location) = workerScope.getFunctions(name).filter(predicate)
override fun getFunctions(name: Name, location: UsageLocation) = workerScope.getFunctions(name).filter(predicate)
override fun getContainingDeclaration() = workerScope.getContainingDeclaration()
@@ -33,9 +33,9 @@ public class FilteringScope(private val workerScope: JetScope, private val predi
override fun getPackage(name: Name) = filterDescriptor(workerScope.getPackage(name))
override fun getClassifier(name: Name, location: Location) = filterDescriptor(workerScope.getClassifier(name))
override fun getClassifier(name: Name, location: UsageLocation) = filterDescriptor(workerScope.getClassifier(name))
override fun getProperties(name: Name, location: Location) = workerScope.getProperties(name).filter(predicate)
override fun getProperties(name: Name, location: UsageLocation) = workerScope.getProperties(name).filter(predicate)
override fun getSyntheticExtensionProperties(receiverTypes: Collection<JetType>, name: Name): Collection<PropertyDescriptor> = workerScope.getSyntheticExtensionProperties(receiverTypes, name).filter(predicate)
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
import org.jetbrains.kotlin.name.Name
public class InnerClassesScopeWrapper(override val workerScope: JetScope) : AbstractScopeAdapter() {
override fun getClassifier(name: Name, location: Location) = workerScope.getClassifier(name) as? ClassDescriptor
override fun getClassifier(name: Name, location: UsageLocation) = workerScope.getClassifier(name) as? ClassDescriptor
override fun getDeclarationsByLabel(labelName: Name) = workerScope.getDeclarationsByLabel(labelName).filterIsInstance<ClassDescriptor>()
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
+5 -5
View File
@@ -25,15 +25,15 @@ import java.lang.reflect.Modifier
public interface JetScope {
public fun getClassifier(name: Name, location: Location = Location.NOWHERE): ClassifierDescriptor?
public fun getClassifier(name: Name, location: UsageLocation = UsageLocation.NO_LOCATION): ClassifierDescriptor?
public fun getPackage(name: Name): PackageViewDescriptor?
public fun getProperties(name: Name, location: Location = Location.NOWHERE): Collection<VariableDescriptor>
public fun getProperties(name: Name, location: UsageLocation = UsageLocation.NO_LOCATION): Collection<VariableDescriptor>
public fun getLocalVariable(name: Name): VariableDescriptor?
public fun getFunctions(name: Name, location: Location = Location.NOWHERE): Collection<FunctionDescriptor>
public fun getFunctions(name: Name, location: UsageLocation = UsageLocation.NO_LOCATION): Collection<FunctionDescriptor>
public fun getSyntheticExtensionProperties(receiverTypes: Collection<JetType>, name: Name): Collection<PropertyDescriptor>
@@ -244,8 +244,8 @@ public interface DescriptorKindExclude {
}
}
public interface Location {
public interface UsageLocation {
companion object {
val NOWHERE = object : Location {}
val NO_LOCATION = object : UsageLocation {}
}
}
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScopeImpl.kt
+3 -3
View File
@@ -22,15 +22,15 @@ import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.utils.Printer
public abstract class JetScopeImpl : JetScope {
override fun getClassifier(name: Name, location: Location): ClassifierDescriptor? = null
override fun getClassifier(name: Name, location: UsageLocation): ClassifierDescriptor? = null
override fun getProperties(name: Name, location: Location): Collection<VariableDescriptor> = setOf()
override fun getProperties(name: Name, location: UsageLocation): Collection<VariableDescriptor> = setOf()
override fun getLocalVariable(name: Name): VariableDescriptor? = null
override fun getPackage(name: Name): PackageViewDescriptor? = null
override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor> = setOf()
override fun getFunctions(name: Name, location: UsageLocation): Collection<FunctionDescriptor> = setOf()
override fun getSyntheticExtensionProperties(receiverTypes: Collection<JetType>, name: Name): Collection<PropertyDescriptor> = listOf()
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinClass.kt
+2 -2
View File
@@ -28,7 +28,7 @@ import java.util.ArrayList
public class StaticScopeForKotlinClass(
private val containingClass: ClassDescriptor
) : JetScopeImpl() {
override fun getClassifier(name: Name, location: Location) = null // TODO
override fun getClassifier(name: Name, location: UsageLocation) = null // TODO
private val functions: List<FunctionDescriptor> by lazy {
if (containingClass.getKind() != ClassKind.ENUM_CLASS) {
@@ -44,7 +44,7 @@ public class StaticScopeForKotlinClass(
override fun getOwnDeclaredDescriptors() = functions
override fun getFunctions(name: Name, location: Location) = functions.filterTo(ArrayList<FunctionDescriptor>(2)) { it.getName() == name }
override fun getFunctions(name: Name, location: UsageLocation) = functions.filterTo(ArrayList<FunctionDescriptor>(2)) { it.getName() == name }
override fun getContainingDeclaration() = containingClass
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt
+3 -3
View File
@@ -61,13 +61,13 @@ public class SubstitutingScope(private val workerScope: JetScope, private val su
return result
}
override fun getProperties(name: Name, location: Location) = substitute(workerScope.getProperties(name))
override fun getProperties(name: Name, location: UsageLocation) = substitute(workerScope.getProperties(name))
override fun getLocalVariable(name: Name) = substitute(workerScope.getLocalVariable(name))
override fun getClassifier(name: Name, location: Location) = substitute(workerScope.getClassifier(name))
override fun getClassifier(name: Name, location: UsageLocation) = substitute(workerScope.getClassifier(name))
override fun getFunctions(name: Name, location: Location) = substitute(workerScope.getFunctions(name))
override fun getFunctions(name: Name, location: UsageLocation) = substitute(workerScope.getFunctions(name))
override fun getSyntheticExtensionProperties(receiverTypes: Collection<JetType>, name: Name): Collection<PropertyDescriptor> = substitute(workerScope.getSyntheticExtensionProperties(receiverTypes, name))
core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+7 -7
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.impl.*;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter;
import org.jetbrains.kotlin.resolve.scopes.JetScope;
import org.jetbrains.kotlin.resolve.scopes.Location;
import org.jetbrains.kotlin.resolve.scopes.UsageLocation;
import org.jetbrains.kotlin.storage.LockBasedStorageManager;
import org.jetbrains.kotlin.types.error.ErrorSimpleFunctionDescriptorImpl;
import org.jetbrains.kotlin.utils.Printer;
@@ -83,13 +83,13 @@ public class ErrorUtils {
@Nullable
@Override
public ClassifierDescriptor getClassifier(@NotNull Name name, @NotNull Location location) {
public ClassifierDescriptor getClassifier(@NotNull Name name, @NotNull UsageLocation location) {
return createErrorClass(name.asString());
}
@NotNull
@Override
public Set<VariableDescriptor> getProperties(@NotNull Name name, @NotNull Location location) {
public Set<VariableDescriptor> getProperties(@NotNull Name name, @NotNull UsageLocation location) {
return ERROR_VARIABLE_GROUP;
}
@@ -125,7 +125,7 @@ public class ErrorUtils {
@NotNull
@Override
public Set<FunctionDescriptor> getFunctions(@NotNull Name name, @NotNull Location location) {
public Set<FunctionDescriptor> getFunctions(@NotNull Name name, @NotNull UsageLocation location) {
return Collections.<FunctionDescriptor>singleton(createErrorFunction(this));
}
@@ -181,7 +181,7 @@ public class ErrorUtils {
@Nullable
@Override
public ClassifierDescriptor getClassifier(@NotNull Name name, @NotNull Location location) {
public ClassifierDescriptor getClassifier(@NotNull Name name, @NotNull UsageLocation location) {
throw new IllegalStateException();
}
@@ -193,7 +193,7 @@ public class ErrorUtils {
@NotNull
@Override
public Collection<VariableDescriptor> getProperties(@NotNull Name name, @NotNull Location location) {
public Collection<VariableDescriptor> getProperties(@NotNull Name name, @NotNull UsageLocation location) {
throw new IllegalStateException();
}
@@ -205,7 +205,7 @@ public class ErrorUtils {
@NotNull
@Override
public Collection<FunctionDescriptor> getFunctions(@NotNull Name name, @NotNull Location location) {
public Collection<FunctionDescriptor> getFunctions(@NotNull Name name, @NotNull UsageLocation location) {
throw new IllegalStateException();
}
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
+4 -4
View File
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.JetScopeImpl
import org.jetbrains.kotlin.resolve.scopes.Location
import org.jetbrains.kotlin.resolve.scopes.UsageLocation
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
@@ -93,7 +93,7 @@ public abstract class DeserializedMemberScope protected constructor(
protected open fun computeNonDeclaredFunctions(name: Name, functions: MutableCollection<FunctionDescriptor>) {
}
override fun getFunctions(name: Name, location: Location): Collection<FunctionDescriptor> = functions(name)
override fun getFunctions(name: Name, location: UsageLocation): Collection<FunctionDescriptor> = functions(name)
private fun computeProperties(name: Name): Collection<VariableDescriptor> {
val descriptors = computeMembers<PropertyDescriptor>(name, Kind.PROPERTY)
@@ -104,9 +104,9 @@ public abstract class DeserializedMemberScope protected constructor(
protected open fun computeNonDeclaredProperties(name: Name, descriptors: MutableCollection<PropertyDescriptor>) {
}
override fun getProperties(name: Name, location: Location): Collection<VariableDescriptor> = properties.invoke(name)
override fun getProperties(name: Name, location: UsageLocation): Collection<VariableDescriptor> = properties.invoke(name)
override fun getClassifier(name: Name, location: Location) = getClassDescriptor(name)
override fun getClassifier(name: Name, location: UsageLocation) = getClassDescriptor(name)
protected abstract fun getClassDescriptor(name: Name): ClassifierDescriptor?