K2: handle type parameter vs nested class conflict in body resolve properly

This commit does two things:
- prioritize type parameter scopes against static scopes in body resolve
(effectively it's a revert of KT-58028 fix)
- consider type parameters as inapplicable callable, so during callable
resolve we can go up the tower and still resolve to static scope

This allows both KT-58028 and KT-63377 to work properly
#KT-63377 Fixed

compiler/fir/analysis-tests/testData/resolve/diagnostics/multipleBounds.fir.txt

@@ -53,8 +53,8 @@ FILE: multipleBounds.kt
         }
 
         public final fun test(t: R|T|): R|kotlin/Unit| {
-            R|?|.<Unresolved name: foo>#()
-            R|?|.<Unresolved name: bar>#()
+            R|?<Type parameter T in qualified access>#|.<Unresolved name: foo>#()
+            R|?<Type parameter T in qualified access>#|.<Unresolved name: bar>#()
             R|<local>/t|.R|Jet87/A.foo|()
             R|<local>/t|.R|Jet87/B.bar|()
         }
@@ -96,8 +96,8 @@ FILE: multipleBounds.kt
 
     }
     public final fun <T : R|Jet87/A|, R|Jet87/B|> test2(t: R|T|): R|kotlin/Unit| {
-        R|?|.<Unresolved name: foo>#()
-        R|?|.<Unresolved name: bar>#()
+        R|?<Type parameter T in qualified access>#|.<Unresolved name: foo>#()
+        R|?<Type parameter T in qualified access>#|.<Unresolved name: bar>#()
         R|<local>/t|.R|Jet87/A.foo|()
         R|<local>/t|.R|Jet87/B.bar|()
     }

compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt

@@ -362,6 +362,9 @@ private fun mapInapplicableCandidateError(
                 qualifiedAccessSource
             )
 
+            // Reported later
+            is TypeParameterAsExpression -> null
+
             else -> genericDiagnostic
         }
     }.distinct()

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt

@@ -608,7 +608,13 @@ fun createConeDiagnosticForCandidateWithError(
         }
         CandidateApplicability.INAPPLICABLE_WRONG_RECEIVER -> ConeInapplicableWrongReceiver(listOf(candidate))
         CandidateApplicability.K2_NO_COMPANION_OBJECT -> ConeNoCompanionObject(candidate)
-        else -> ConeInapplicableCandidateError(applicability, candidate)
+        else -> {
+            if (TypeParameterAsExpression in candidate.diagnostics) {
+                ConeTypeParameterInQualifiedAccess(candidate.symbol as FirTypeParameterSymbol)
+            } else {
+                ConeInapplicableCandidateError(applicability, candidate)
+            }
+        }
     }
 }
 

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallKind.kt

@@ -24,6 +24,7 @@ sealed class CallKind(vararg resolutionSequence: ResolutionStage) {
         LowerPriorityIfDynamic,
         ConstraintSystemForks,
         CheckIncompatibleTypeVariableUpperBounds,
+        TypeParameterAsCallable,
     )
 
     object SyntheticSelect : CallKind(
@@ -59,6 +60,7 @@ sealed class CallKind(vararg resolutionSequence: ResolutionStage) {
         LowerPriorityIfDynamic,
         ConstraintSystemForks,
         CheckIncompatibleTypeVariableUpperBounds,
+        TypeParameterAsCallable,
     )
 
     object DelegatingConstructorCall : CallKind(

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionStages.kt

@@ -780,3 +780,11 @@ internal object ConstraintSystemForks : ResolutionStage() {
         }
     }
 }
+
+internal object TypeParameterAsCallable : ResolutionStage() {
+    override suspend fun check(candidate: Candidate, callInfo: CallInfo, sink: CheckerSink, context: ResolutionContext) {
+        if (candidate.symbol is FirTypeParameterSymbol) {
+            sink.yieldDiagnostic(TypeParameterAsExpression)
+        }
+    }
+}

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt

@@ -471,10 +471,11 @@ class BodyResolveContext(
         // Otherwise, reuse staticsAndCompanion.
         val forConstructorHeader = if (typeParameterScope != null) {
             towerDataContext
-                .addNonLocalScope(typeParameterScope)
                 .addNonLocalTowerDataElements(towerElementsForClass.superClassesStaticsAndCompanionReceivers)
                 .run { towerElementsForClass.companionReceiver?.let { addReceiver(null, it) } ?: this }
                 .addNonLocalScopesIfNotNull(towerElementsForClass.companionStaticScope, towerElementsForClass.staticScope)
+                // Note: scopes here are in reverse order, so type parameter scope is the most prioritized
+                .addNonLocalScope(typeParameterScope)
         } else {
             staticsAndCompanion
         }

compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/calls/ResolutionDiagnostic.kt

@@ -146,4 +146,6 @@ class AmbiguousValuesForContextReceiverParameter(
 
 object ResolutionResultOverridesOtherToPreserveCompatibility : ResolutionDiagnostic(RESOLVED)
 
-object AdaptedCallableReferenceIsUsedWithReflection : ResolutionDiagnostic(RESOLVED_WITH_ERROR)
+object AdaptedCallableReferenceIsUsedWithReflection : ResolutionDiagnostic(RESOLVED_WITH_ERROR)
+
+object TypeParameterAsExpression : ResolutionDiagnostic(INAPPLICABLE)