From a4f9e46c085c8c3abaf0b97c15140df807b1dd43 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <dmitry.petrov@jetbrains.com>
Date: Wed, 8 Feb 2017 16:30:15 +0300
Subject: [PATCH] Fix https://ea.jetbrains.com/browser/ea_reports/1337846:
 Properly handle AbbreviatedTypeBinding for error types. Get rid of code
 duplication.

---
 .../jetbrains/kotlin/resolve/TypeBinding.kt   | 35 ++++++++++---------
 .../diagnostics/tests/variance/ea1337846.kt   | 21 +++++++++++
 .../diagnostics/tests/variance/ea1337846.txt  |  9 +++++
 .../checkers/DiagnosticsTestGenerated.java    |  6 ++++
 4 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 compiler/testData/diagnostics/tests/variance/ea1337846.kt
 create mode 100644 compiler/testData/diagnostics/tests/variance/ea1337846.txt

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt
index fa7bb60c037..cf1c638d2ee 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt
@@ -116,12 +116,9 @@ private class AbbreviatedTypeBinding(
     override val isInAbbreviation: Boolean get() = true
 
     override val arguments: List<TypeArgumentBinding<KtTypeElement>?>
-        get() = type.arguments.mapIndexed { index, argument ->
-            TypeArgumentBindingImpl(
-                    argument,
-                    type.constructor.parameters[index],
-                    AbbreviatedTypeBinding(argument.type, psiElement)
-            )
+        get() = createTypeArgumentBindingsWithSinglePsiElement(type) {
+            argumentType ->
+            AbbreviatedTypeBinding(argumentType, psiElement)
         }
 }
 
@@ -133,16 +130,22 @@ private class NoTypeElementBinding<out P : PsiElement>(
     override val isInAbbreviation: Boolean get() = false
 
     override val arguments: List<TypeArgumentBinding<P>?>
-        get() {
-            val isErrorBinding = type.isError || type.constructor.parameters.size != type.arguments.size
-            return type.arguments.indices.map {
-                val typeProjection = type.arguments[it]
-                TypeArgumentBindingImpl(
-                        typeProjection,
-                        if (isErrorBinding) null else type.constructor.parameters[it],
-                        NoTypeElementBinding(trace, psiElement, typeProjection.type)
-                )
-            }
+        get() = createTypeArgumentBindingsWithSinglePsiElement(type) {
+            argumentType ->
+            NoTypeElementBinding(trace, psiElement, argumentType)
         }
 }
 
+internal fun <P : PsiElement> createTypeArgumentBindingsWithSinglePsiElement(
+        type: KotlinType,
+        createBinding: (KotlinType) -> TypeBinding<P>
+) : List<TypeArgumentBinding<P>> {
+    val isErrorBinding = type.isError || type.constructor.parameters.size != type.arguments.size
+    return type.arguments.mapIndexed { index, typeProjection ->
+        TypeArgumentBindingImpl(
+                typeProjection,
+                if (isErrorBinding) null else type.constructor.parameters[index],
+                createBinding(typeProjection.type)
+        )
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/variance/ea1337846.kt b/compiler/testData/diagnostics/tests/variance/ea1337846.kt
new file mode 100644
index 00000000000..35739c8272d
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/variance/ea1337846.kt
@@ -0,0 +1,21 @@
+// https://ea.jetbrains.com/browser/ea_reports/1337846
+
+//interface ComputablePoint<NumberType : Number>
+//
+//interface ComputableSegment<NumberType: Number, PointType>
+//
+//interface ComputableLineSegment<NumberType: Number, PointType> : ComputableSegment<NumberType, PointType>
+
+//interface Path<NumberType, PointType, SegmentType>
+
+typealias EachSegmentComparator<SegmentType> = (currentSegment: SegmentType, otherSegment: SegmentType, relationship: Int) -> Boolean
+
+interface ComputablePath<NumberType, PointType, out SegmentType>
+    : <!UNRESOLVED_REFERENCE!>Path<!><NumberType, PointType, SegmentType>
+where
+    NumberType: Number,
+    PointType: <!UNRESOLVED_REFERENCE!>ComputablePoint<!><NumberType>,
+    SegmentType: <!UNRESOLVED_REFERENCE!>ComputableLineSegment<!><NumberType, PointType>
+{
+    fun anyTwoSegments(comparator: EachSegmentComparator<<!UNRESOLVED_REFERENCE!>ComputableSegment<!><NumberType, PointType>>): Boolean
+}
diff --git a/compiler/testData/diagnostics/tests/variance/ea1337846.txt b/compiler/testData/diagnostics/tests/variance/ea1337846.txt
new file mode 100644
index 00000000000..d9955784989
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/variance/ea1337846.txt
@@ -0,0 +1,9 @@
+package
+
+public interface ComputablePath</*0*/ NumberType : kotlin.Number, /*1*/ PointType, /*2*/ out SegmentType> {
+    public abstract fun anyTwoSegments(/*0*/ comparator: EachSegmentComparator<[ERROR : ComputableSegment<NumberType, PointType>]<NumberType, PointType>> /* = ([ERROR : ComputableSegment<NumberType, PointType>]<NumberType, PointType>, [ERROR : ComputableSegment<NumberType, PointType>]<NumberType, PointType>, relationship: kotlin.Int) -> kotlin.Boolean */): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+public typealias EachSegmentComparator</*0*/ SegmentType>  = (currentSegment: SegmentType, otherSegment: SegmentType, relationship: kotlin.Int) -> kotlin.Boolean
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 7ca2232aa64..744cd22598f 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -22489,6 +22489,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("ea1337846.kt")
+            public void testEa1337846() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/ea1337846.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("Function.kt")
             public void testFunction() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/Function.kt");