From 4d9102f749b5ca237160b7275df7b4af6fc064ce Mon Sep 17 00:00:00 2001
From: Tianyu Geng <tgeng@google.com>
Date: Thu, 22 Jul 2021 16:27:04 -0700
Subject: [PATCH] FIR checker: fix position strategy of
 TYPE_PARAMETERS_IN_OBJECT

---
 .../diagnostics/typeParametersInObject.kt     |  8 +++----
 .../diagnostics/FirDiagnosticsList.kt         |  2 +-
 .../fir/analysis/diagnostics/FirErrors.kt     |  2 +-
 .../typeParametersInObject.fir.kt             | 21 -------------------
 .../classObjects/typeParametersInObject.kt    |  1 +
 5 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 compiler/testData/diagnostics/tests/classObjects/typeParametersInObject.fir.kt

diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.kt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.kt
index cce8b4d04bc..f40e7efb34d 100644
--- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.kt
@@ -1,15 +1,15 @@
-<!TYPE_PARAMETERS_IN_OBJECT!>object A<!><T, K : T> {
-    <!TYPE_PARAMETERS_IN_OBJECT!>object B<!><L>
+object A<!TYPE_PARAMETERS_IN_OBJECT!><T, K : T><!> {
+    object B<!TYPE_PARAMETERS_IN_OBJECT!><L><!>
 }
 
 class N {
-    companion <!TYPE_PARAMETERS_IN_OBJECT!>object<!><T> {
+    companion object<!TYPE_PARAMETERS_IN_OBJECT!><T><!> {
 
     }
 }
 
 fun test() {
-    <!LOCAL_OBJECT_NOT_ALLOWED, TYPE_PARAMETERS_IN_OBJECT!>object M<!><H> {
+    <!LOCAL_OBJECT_NOT_ALLOWED!>object M<!><!TYPE_PARAMETERS_IN_OBJECT!><H><!> {
 
     }
 }
diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt
index 615ee34c3ac..c9337b67a94 100644
--- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt
+++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt
@@ -499,7 +499,7 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
         val OUTER_CLASS_ARGUMENTS_REQUIRED by error<PsiElement> {
             parameter<FirRegularClassSymbol>("outer")
         }
-        val TYPE_PARAMETERS_IN_OBJECT by error<PsiElement>()
+        val TYPE_PARAMETERS_IN_OBJECT by error<PsiElement>(PositioningStrategy.TYPE_PARAMETERS_LIST)
         val ILLEGAL_PROJECTION_USAGE by error<PsiElement>()
         val TYPE_PARAMETERS_IN_ENUM by error<PsiElement>()
         val CONFLICTING_PROJECTION by error<KtTypeProjection>(PositioningStrategy.VARIANCE_MODIFIER) {
diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
index ee85fa6bf49..95d7aaa518b 100644
--- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
+++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
@@ -332,7 +332,7 @@ object FirErrors {
     val WRONG_NUMBER_OF_TYPE_ARGUMENTS by error2<PsiElement, Int, FirRegularClassSymbol>()
     val NO_TYPE_ARGUMENTS_ON_RHS by error2<PsiElement, Int, FirClassLikeSymbol<*>>()
     val OUTER_CLASS_ARGUMENTS_REQUIRED by error1<PsiElement, FirRegularClassSymbol>()
-    val TYPE_PARAMETERS_IN_OBJECT by error0<PsiElement>()
+    val TYPE_PARAMETERS_IN_OBJECT by error0<PsiElement>(SourceElementPositioningStrategies.TYPE_PARAMETERS_LIST)
     val ILLEGAL_PROJECTION_USAGE by error0<PsiElement>()
     val TYPE_PARAMETERS_IN_ENUM by error0<PsiElement>()
     val CONFLICTING_PROJECTION by error1<KtTypeProjection, ConeKotlinType>(SourceElementPositioningStrategies.VARIANCE_MODIFIER)
diff --git a/compiler/testData/diagnostics/tests/classObjects/typeParametersInObject.fir.kt b/compiler/testData/diagnostics/tests/classObjects/typeParametersInObject.fir.kt
deleted file mode 100644
index d47c0663b00..00000000000
--- a/compiler/testData/diagnostics/tests/classObjects/typeParametersInObject.fir.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-<!TYPE_PARAMETERS_IN_OBJECT!>object A<!><T>
-<!TYPE_PARAMETERS_IN_OBJECT!>object B<!><in T, out R>
-<!TYPE_PARAMETERS_IN_OBJECT!>object C<!><T : Comparable<T>>
-
-class D {
-    companion <!TYPE_PARAMETERS_IN_OBJECT!>object<!><T>
-}
-
-class E {
-    companion <!TYPE_PARAMETERS_IN_OBJECT!>object<!><in T, out R>
-}
-
-class F {
-    companion <!TYPE_PARAMETERS_IN_OBJECT!>object C<!><T : Comparable<T>>
-}
-
-class G {
-    companion <!TYPE_PARAMETERS_IN_OBJECT!>object F<!><T>
-}
-
-<!TYPE_PARAMETERS_IN_OBJECT!>object H<!><T, R><!CONSTRUCTOR_IN_OBJECT!>()<!>
diff --git a/compiler/testData/diagnostics/tests/classObjects/typeParametersInObject.kt b/compiler/testData/diagnostics/tests/classObjects/typeParametersInObject.kt
index fb6cb213662..fa886139e87 100644
--- a/compiler/testData/diagnostics/tests/classObjects/typeParametersInObject.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/typeParametersInObject.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 object A<!TYPE_PARAMETERS_IN_OBJECT!><T><!>
 object B<!TYPE_PARAMETERS_IN_OBJECT!><in T, out R><!>
 object C<!TYPE_PARAMETERS_IN_OBJECT!><T : Comparable<T>><!>