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

Minor. Rename parameter and get rid of labels

Browse Source
This commit is contained in:
Denis Zharkov
2016-01-25 13:46:25 +03:00
parent c26ca5e7ef
commit 8e3bdd6a0f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.kt
+4 -4
View File
@@ -119,13 +119,13 @@ fun KotlinType.computeNewSubstitution(
fun KotlinType.replace( fun KotlinType.replace(
newArguments: List<TypeProjection>, newArguments: List<TypeProjection>,
annotations: Annotations = this@replace.annotations newAnnotations: Annotations = annotations
): KotlinType { ): KotlinType {
if (newArguments.isEmpty() && annotations === this.annotations) return this if (newArguments.isEmpty() && newAnnotations === annotations) return this
if (newArguments.isEmpty()) { if (newArguments.isEmpty()) {
return KotlinTypeImpl.create( return KotlinTypeImpl.create(
annotations, newAnnotations,
constructor, constructor,
isMarkedNullable, isMarkedNullable,
arguments, arguments,
@@ -144,7 +144,7 @@ fun KotlinType.replace(
else ErrorUtils.createErrorScope("Unexpected declaration descriptor for type constructor: $constructor") else ErrorUtils.createErrorScope("Unexpected declaration descriptor for type constructor: $constructor")
return KotlinTypeImpl.create( return KotlinTypeImpl.create(
annotations, newAnnotations,
constructor, constructor,
isMarkedNullable, isMarkedNullable,
newArguments, newArguments,