From 840e627f1f4dd9eaaebdc893ecb3af6c3d52a33a Mon Sep 17 00:00:00 2001
From: Ivan Cilcic <cilcic.v22@gmail.com>
Date: Mon, 8 Jul 2019 16:37:12 +0300
Subject: [PATCH] Add annotation processing in joinTypeParameters method

---
 .../jetbrains/kotlin/fir/lightTree/ConverterUtil.kt    |  9 +++++----
 .../kotlin/fir/lightTree/fir/TypeConstraint.kt         | 10 +---------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/ConverterUtil.kt b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/ConverterUtil.kt
index d5b37d79ad7..960d8c9d4cb 100644
--- a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/ConverterUtil.kt
+++ b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/ConverterUtil.kt
@@ -121,11 +121,12 @@ object ConverterUtil {
     }
 
     fun FirTypeParameterContainer.joinTypeParameters(typeConstraints: List<TypeConstraint>) {
-        typeConstraints.forEach { (identifier, type) ->
+        typeConstraints.forEach { typeConstraint ->
             this.typeParameters.forEach { typeParameter ->
-                if (identifier == typeParameter.name.identifier) {
-                    (typeParameter as FirTypeParameterImpl).bounds += type
-                    typeParameter.annotations += type.annotations
+                if (typeConstraint.identifier == typeParameter.name.identifier) {
+                    (typeParameter as FirTypeParameterImpl).bounds += typeConstraint.firTypeRef
+                    typeParameter.annotations += typeConstraint.firTypeRef.annotations
+                    typeParameter.annotations += typeConstraint.annotations
                 }
             }
         }
diff --git a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt
index 1343d5fcc39..383932f0438 100644
--- a/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt
+++ b/compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt
@@ -8,12 +8,4 @@ package org.jetbrains.kotlin.fir.lightTree.fir
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 
-class TypeConstraint(val annotations: List<FirAnnotationCall>, val identifier: String, val firTypeRef: FirTypeRef) {
-    operator fun component1(): String {
-        return identifier
-    }
-
-    operator fun component2(): FirTypeRef {
-        return firTypeRef
-    }
-}
\ No newline at end of file
+class TypeConstraint(val annotations: List<FirAnnotationCall>, val identifier: String, val firTypeRef: FirTypeRef)
\ No newline at end of file