From 54ea6113d749382c20432541448c88c9ce85e1f5 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 2 Apr 2015 21:49:44 +0300 Subject: [PATCH] Replaced addTypeParameterDescriptor with addClassifierDescriptor - it does the same --- .../kotlin/descriptors/impl/MutableClassDescriptor.java | 2 +- .../org/jetbrains/kotlin/resolve/DescriptorResolver.java | 2 +- .../jetbrains/kotlin/resolve/FunctionDescriptorUtil.java | 2 +- .../org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java | 2 +- .../org/jetbrains/kotlin/resolve/scopes/WritableScope.kt | 2 -- .../jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt | 6 ------ .../src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt | 2 +- 7 files changed, 5 insertions(+), 13 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java index 0b981c2a8d8..8669eb2684e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java @@ -243,7 +243,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class } this.typeParameters = new ArrayList(typeParameters); for (TypeParameterDescriptor typeParameterDescriptor : typeParameters) { - scopeForSupertypeResolution.addTypeParameterDescriptor(typeParameterDescriptor); + scopeForSupertypeResolution.addClassifierDescriptor(typeParameterDescriptor); } scopeForSupertypeResolution.changeLockLevel(WritableScope.LockLevel.READING); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 686ed00181a..aa725daf281 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -435,7 +435,7 @@ public class DescriptorResolver { toSourceElement(typeParameter) ); trace.record(BindingContext.TYPE_PARAMETER, typeParameter, typeParameterDescriptor); - extensibleScope.addTypeParameterDescriptor(typeParameterDescriptor); + extensibleScope.addClassifierDescriptor(typeParameterDescriptor); return typeParameterDescriptor; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java index 82b1ed6c62a..801b3af2abd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java @@ -86,7 +86,7 @@ public class FunctionDescriptorUtil { parameterScope.setImplicitReceiver(receiver); } for (TypeParameterDescriptor typeParameter : descriptor.getTypeParameters()) { - parameterScope.addTypeParameterDescriptor(typeParameter); + parameterScope.addClassifierDescriptor(typeParameter); } for (ValueParameterDescriptor valueParameterDescriptor : descriptor.getValueParameters()) { parameterScope.addVariableDescriptor(valueParameterDescriptor); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java index 1308b52a1b9..2e879d268f3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java @@ -131,7 +131,7 @@ public final class JetScopeUtils { result.addLabeledDeclaration(propertyDescriptor); } for (TypeParameterDescriptor typeParameterDescriptor : typeParameters) { - result.addTypeParameterDescriptor(typeParameterDescriptor); + result.addClassifierDescriptor(typeParameterDescriptor); } if (receiver != null) { result.setImplicitReceiver(receiver); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt index 9997c1867e4..a1d1749ae1c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt @@ -35,8 +35,6 @@ public trait WritableScope : JetScope { public fun addFunctionDescriptor(functionDescriptor: FunctionDescriptor) - public fun addTypeParameterDescriptor(typeParameterDescriptor: TypeParameterDescriptor) - public fun addClassifierDescriptor(classDescriptor: ClassifierDescriptor) public fun addClassifierAlias(name: Name, classifierDescriptor: ClassifierDescriptor) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt index 4b3a37cd535..60f6185b5c8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt @@ -193,12 +193,6 @@ public class WritableScopeImpl(scope: JetScope, return result } - override fun addTypeParameterDescriptor(typeParameterDescriptor: TypeParameterDescriptor) { - checkMayWrite() - - addClassifierAlias(typeParameterDescriptor.getName(), typeParameterDescriptor) - } - override fun addClassifierDescriptor(classDescriptor: ClassifierDescriptor) { checkMayWrite() 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 228a876153c..06b451447f5 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 @@ -137,7 +137,7 @@ private fun getClassInnerScope(outerScope: JetScope, descriptor: ClassDescriptor val headerScope = WritableScopeImpl(outerScope, descriptor, redeclarationHandler, "Class ${descriptor.getName()} header scope") for (typeParameter in descriptor.getTypeConstructor().getParameters()) { - headerScope.addTypeParameterDescriptor(typeParameter) + headerScope.addClassifierDescriptor(typeParameter) } for (constructor in descriptor.getConstructors()) { headerScope.addFunctionDescriptor(constructor)