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

Replaced addTypeParameterDescriptor with addClassifierDescriptor - it does the same

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-04-02 21:49:44 +03:00
parent ffc22e8b16
commit 54ea6113d7
7 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java
+1 -1
View File
@@ -243,7 +243,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class
}
this.typeParameters = new ArrayList<TypeParameterDescriptor>(typeParameters);
for (TypeParameterDescriptor typeParameterDescriptor : typeParameters) {
scopeForSupertypeResolution.addTypeParameterDescriptor(typeParameterDescriptor);
scopeForSupertypeResolution.addClassifierDescriptor(typeParameterDescriptor);
}
scopeForSupertypeResolution.changeLockLevel(WritableScope.LockLevel.READING);
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
+1 -1
View File
@@ -435,7 +435,7 @@ public class DescriptorResolver {
toSourceElement(typeParameter)
);
trace.record(BindingContext.TYPE_PARAMETER, typeParameter, typeParameterDescriptor);
extensibleScope.addTypeParameterDescriptor(typeParameterDescriptor);
extensibleScope.addClassifierDescriptor(typeParameterDescriptor);
return typeParameterDescriptor;
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java
+1 -1
View File
@@ -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);
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java
+1 -1
View File
@@ -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);
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt
-2
View File
@@ -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)
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
-6
View File
@@ -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()
idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt
+1 -1
View File
@@ -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)