diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt
index 23db2be94bc7..b620789f1033 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt
@@ -9,14 +9,16 @@ import com.intellij.lang.parameterInfo.UpdateParameterInfoContext
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.ui.Gray
 import com.intellij.ui.JBColor
-import org.jetbrains.kotlin.config.LanguageFeature
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.analyse
 import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions
 import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionLikeSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.analysis.api.types.KtClassErrorType
+import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor
+import org.jetbrains.kotlin.config.LanguageFeature
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
 import org.jetbrains.kotlin.lexer.KtSingleValueToken
 import org.jetbrains.kotlin.lexer.KtTokens
@@ -146,14 +148,14 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
                 // functional values (see FunctionalValue*.kt tests), and Java functions (see useJava*FromLib.kt tests).
                 // HL API gets a different symbol because a new ScopeSession() is used, and therefore a new enhanced FirFunction is created.
                 val candidateToMatch = candidateInfo.candidate.restoreSymbol() ?: return@analyse
-                val (candidate, argumentMapping) = candidatesWithMapping.firstOrNull { it.candidate == candidateToMatch } ?: return@analyse
+                val (candidate, argumentMapping, substitutor) = candidatesWithMapping.firstOrNull { it.candidate == candidateToMatch }
+                    ?: return@analyse
 
                 // For array set calls, we only want the index arguments in brackets, which are all except the last (the value to set).
                 val isArraySetCall = candidate.callableIdIfNonLocal?.let {
                     val isSet = it.callableName == OperatorNameConventions.SET
                     isSet && callElement is KtArrayAccessExpression
                 } ?: false
-                // TODO: Get substituted value parameters. Not currently available in HL API. See SubstituteFromArguments*.kt tests
                 val valueParameters = candidate.valueParameters.let { if (isArraySetCall) it.dropLast(1) else it }
                 val setValueParameter = if (isArraySetCall) candidate.valueParameters.last() else null
 
@@ -170,7 +172,7 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
                         // TODO: Add hasSynthesizedParameterNames to HL API.
                         // See resolveValueParameters() in core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt
                         val hasSynthesizedParameterNames = false
-                        val parameterText = renderParameter(parameter, includeName = !hasSynthesizedParameterNames)
+                        val parameterText = renderParameter(parameter, substitutor, includeName = !hasSynthesizedParameterNames)
                         put(index, parameterText)
                     }
                 }
@@ -195,6 +197,7 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
                     arguments,
                     currentArgumentIndex,
                     argumentMapping,
+                    substitutor,
                     setValueParameter
                 )
 
@@ -223,7 +226,11 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
             .count { it.node.elementType == KtTokens.COMMA }
     }
 
-    private fun KtAnalysisSession.renderParameter(parameter: KtValueParameterSymbol, includeName: Boolean): String {
+    private fun KtAnalysisSession.renderParameter(
+        parameter: KtValueParameterSymbol,
+        substitutor: KtSubstitutor,
+        includeName: Boolean
+    ): String {
         return buildString {
             val annotationFqNames =
                 parameter.annotations
@@ -244,7 +251,10 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
                 append(": ")
             }
 
-            append(parameter.annotatedType.type.render(KtTypeRendererOptions.SHORT_NAMES))
+            val unsubstitutedType = parameter.annotatedType.type
+            val substitutedType = substitutor.substituteOrSelf(unsubstitutedType)
+            val typeToRender = substitutedType.takeUnless { it is KtClassErrorType } ?: unsubstitutedType
+            append(typeToRender.render(KtTypeRendererOptions.SHORT_NAMES))
 
             if (parameter.hasDefaultValue) {
                 // TODO: append(" = " + defaultValue).
@@ -282,6 +292,7 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
         arguments: List<KtExpression>,
         currentArgumentIndex: Int,
         argumentMapping: LinkedHashMap<KtExpression, KtValueParameterSymbol>,
+        substitutor: KtSubstitutor,
         setValueParameter: KtValueParameterSymbol?
     ): Boolean {
         for ((index, argument) in arguments.withIndex()) {
@@ -290,8 +301,8 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
             if (parameterForArgument == setValueParameter) continue
 
             val argumentType = argument.getKtType() ?: error("Argument should have a KtType")
-            val parameterType = parameterForArgument.annotatedType.type
-            if (argumentType.isNotSubTypeOf(parameterType)) {
+            val substitutedParameterType = substitutor.substituteOrSelf(parameterForArgument.annotatedType.type)
+            if (argumentType.isNotSubTypeOf(substitutedParameterType)) {
                 return true
             }
         }
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/utils.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/utils.kt
index 17d36669eb63..997507b19f13 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/utils.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/utils.kt
@@ -4,6 +4,7 @@ package org.jetbrains.kotlin.idea.parameterInfo
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithVisibility
+import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor
 import org.jetbrains.kotlin.psi.*
 
 // Analogous to Call.resolveCandidates() in plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/Utils.kt
@@ -27,8 +28,8 @@ internal fun KtAnalysisSession.resolveCallCandidates(callElement: KtElement): Co
 
     val fileSymbol = callElement.containingKtFile.getFileSymbol()
     return resolvedCall.targetFunction.candidates.filter { filterCandidate(it, callElement, fileSymbol, receiver) }.map {
-        // TODO: The argument mapping should also be per-candidate once we have all candidates available.
-        CandidateWithMapping(it, resolvedCall.argumentMapping)
+        // TODO: The argument mapping and substitutor should also be per-candidate once we have all candidates available.
+        CandidateWithMapping(it, resolvedCall.argumentMapping, resolvedCall.substitutor)
     }
 }
 
@@ -63,5 +64,6 @@ internal fun KtAnalysisSession.filterCandidate(
 
 internal data class CandidateWithMapping(
     val candidate: KtFunctionLikeSymbol,
-    val argumentMapping: LinkedHashMap<KtExpression, KtValueParameterSymbol>
+    val argumentMapping: LinkedHashMap<KtExpression, KtValueParameterSymbol>,
+    val substitutor: KtSubstitutor,
 )
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments2.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments2.kt
index 850fa95262b0..ed9ed05abf5a 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments2.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments2.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 fun <T1, T2> f(p: Int, t1: T1, t2: T2){}
 
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments3.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments3.kt
index 26607d0af9c4..b5cccb797462 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments3.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments3.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 fun <T1, T2> f(p: Int, t1: T1, t2: T2){}
 
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments4.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments4.kt
index 843e5718cddf..7b00b593651b 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments4.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments4.kt
@@ -1,4 +1,6 @@
 // IGNORE_FIR
+// FIR renders "pair: Pair<String, ERROR_TYPE <Cannot infer argument for type parameter T2>>"
+// ConeTypeIdeRenderer does not properly render ConeSimpleDiagnostic(kind = CannotInferParameterType); new ConeDiagnostic needed
 fun <T1, T2> f(p: Int, t: T1, pair: Pair<T1, T2>){}
 
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArgumentsOnTyping.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArgumentsOnTyping.kt
index ab86fff6c94d..c1f7c7cba3dd 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArgumentsOnTyping.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArgumentsOnTyping.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 fun <T> f(t1: T, t2: T){}
 
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TypeInference.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TypeInference.kt
index 5524d25fdf7a..39963d06f61c 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TypeInference.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TypeInference.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 fun <A,B> foo(a: A, b: B): B = b
 fun test(x: Any?) = foo(x, x!!<caret>).hashCode()