From 8f6b3d37b983c7dd559c4df42d74df3906168975 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Thu, 5 Oct 2023 15:30:42 +0200
Subject: [PATCH] fixup! [Analysis API] implement an API to get a substitution
 based on a inheritance relationship between classes

---
 .../createInheritanceTypeSubstitutor/chain.kt             | 8 ++++----
 .../createInheritanceTypeSubstitutor/cycle.kt             | 7 +++----
 .../directComplexSubstitution.kt                          | 7 ++++---
 .../createInheritanceTypeSubstitutor/directType.kt        | 6 +++---
 .../createInheritanceTypeSubstitutor/directTypeParam.kt   | 6 +++---
 .../createInheritanceTypeSubstitutor/errorInUpperBound.kt | 6 +++---
 .../createInheritanceTypeSubstitutor/extraTypeArgument.kt | 6 +++---
 .../missingTypeArgument.kt                                | 6 +++---
 .../multipleInheritance.kt                                | 6 +++---
 .../multipleInheritance.result.txt                        | 2 +-
 .../createInheritanceTypeSubstitutor/self.kt              | 4 ++--
 11 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/chain.kt b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/chain.kt
index 589ae5ff009..2e2df304df5 100644
--- a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/chain.kt
+++ b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/chain.kt
@@ -1,10 +1,10 @@
 // WITH_STDLIB
 
-class A<caret_base>A : BB<Int, String>
+class A<caret_base>A : BB<Int, String>()
 
-class BB<S, T> : CC<S, T, List<T>>
+open class BB<S, T> : CC<S, T, List<T>>()
 
-class C<caret_super>C<X, Y, Z> {
-    fun foo(): kotlin.Triple<X, Y, Z>
+open class C<caret_super>C<X, Y, Z> {
+    fun foo(): kotlin.Triple<X, Y, Z> = TODO()
 }
 
diff --git a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/cycle.kt b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/cycle.kt
index 85614733bde..8dbc745eaea 100644
--- a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/cycle.kt
+++ b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/cycle.kt
@@ -1,6 +1,5 @@
-class A<caret_base>A : BB<Int, String>
+class A<caret_base>A : BB<Int, String>()
 
-class BB<S, T> : CC<S, T, List<T>>
-
-class C<caret_super>CC<X, Y, Z> : AA
+open class BB<S, T> : CCC<S, T, List<T>>
 
+class CC<caret_super>C<X, Y, Z> : AA()
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directComplexSubstitution.kt b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directComplexSubstitution.kt
index ad447fd93db..c24b179bafd 100644
--- a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directComplexSubstitution.kt
+++ b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directComplexSubstitution.kt
@@ -1,8 +1,9 @@
 // WITH_STDLIB
 
-class A<caret_base>A<T, S> : BB<List<T>, Map<S, Int>, S>
+class A<caret_base>A<T, S> : BB<List<T>, Map<S, Int>, S>()
 
-class B<caret_super>B<Q, R, T>  {
-    fun foo(): kotlin.Triple<Q, R, T>
+open class B<caret_super>B<Q, R, T>  {
+    fun foo(): kotlin.Triple<Q, R, T> = TODO()
 }
 
+
diff --git a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directType.kt b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directType.kt
index 62f2307be40..4f1ec262c54 100644
--- a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directType.kt
+++ b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directType.kt
@@ -1,8 +1,8 @@
 // WITH_STDLIB
 
-class A<caret_base>A : BB<Int>
+class A<caret_base>A : BB<Int>()
 
-class B<caret_super>B<S> {
-    fun foo(): List<S>
+open class B<caret_super>B<S> {
+    fun foo(): List<S> = TODO()
 }
 
diff --git a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directTypeParam.kt b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directTypeParam.kt
index 8cf762103e5..9e342602675 100644
--- a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directTypeParam.kt
+++ b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/directTypeParam.kt
@@ -1,6 +1,6 @@
-class A<caret_base>A<T> : BB<T>
+class A<caret_base>A<T> : BB<T>()
 
-class B<caret_super>B<S> {
-    fun foo(): S
+open class B<caret_super>B<S> {
+    fun foo(): S = TODO()
 }
 
diff --git a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/errorInUpperBound.kt b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/errorInUpperBound.kt
index 449b8a8aced..7e9b295714d 100644
--- a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/errorInUpperBound.kt
+++ b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/errorInUpperBound.kt
@@ -1,6 +1,6 @@
-class A<caret_base>A : BB<Int>
+class A<caret_base>A : BB<Int>()
 
-class B<caret_super>B<S : String> {
-    fun foo(): S
+open class B<caret_super>B<S : String> {
+    fun foo(): S = TODO()
 }
 
diff --git a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/extraTypeArgument.kt b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/extraTypeArgument.kt
index aed4ff03ee7..1283f909dd6 100644
--- a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/extraTypeArgument.kt
+++ b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/extraTypeArgument.kt
@@ -1,6 +1,6 @@
-class A<caret_base>A : BB<Int, String>
+class A<caret_base>A : BB<Int, String>()
 
-class B<caret_super>B<S> {
-    fun foo(): S
+open class B<caret_super>B<S> {
+    fun foo(): S = TODO()
 }
 
diff --git a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/missingTypeArgument.kt b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/missingTypeArgument.kt
index 66aa59faa8b..3433383aa05 100644
--- a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/missingTypeArgument.kt
+++ b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/missingTypeArgument.kt
@@ -1,7 +1,7 @@
 // WITH_STDLIB
-class A<caret_base>A : BB<Int, String>
+class A<caret_base>A : BB<Int, String>()
 
-class B<caret_super>B<S, Q, U> {
-    fun foo(): Triple<S, Q, U>
+open class B<caret_super>B<S, Q, U> {
+    fun foo(): Triple<S, Q, U> = TODO()
 }
 
diff --git a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/multipleInheritance.kt b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/multipleInheritance.kt
index ec6f28d81bc..62645c39650 100644
--- a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/multipleInheritance.kt
+++ b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/multipleInheritance.kt
@@ -1,7 +1,7 @@
-class A<caret_base>A : BB<Int>, BB<String>
+class A<caret_base>A : BB<Int>, BB<String>()
 
-class B<caret_super>B<S> {
-    fun foo(): Triple<S>
+open class B<caret_super>B<S> {
+    fun foo(): S
 }
 
 
diff --git a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/multipleInheritance.result.txt b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/multipleInheritance.result.txt
index a0204cf464d..50f2aeb6d9f 100644
--- a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/multipleInheritance.result.txt
+++ b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/multipleInheritance.result.txt
@@ -1,3 +1,3 @@
 Substitutor: <map substitutor: {S = kotlin/Int}>
 Substituted callables:
-  foo(): Triple<S>
\ No newline at end of file
+  foo(): Int
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/self.kt b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/self.kt
index e09d01adaac..97f45d1bf96 100644
--- a/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/self.kt
+++ b/analysis/analysis-api/testData/components/substitutorProvider/createInheritanceTypeSubstitutor/self.kt
@@ -2,6 +2,6 @@
 
 class A<caret_base>A<caret_super>A : BB<Int, String>
 
-class BB<S, T> : CC<S, T, List<T>> {
-    fun foo(): Triple<S, T>
+class BB<S, T> {
+    fun foo(): Pair<S, T>
 }