[Analysis API] Adjust `KaFunctionalTypeRenderer` to render parameter names
^KT-65846 fixed
diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java
index a63adcb..2058cf5 100644
--- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java
+++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveCallTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java
index 7948edb..5a19af8 100644
--- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java
+++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveReferenceTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveReferenceTestGenerated.java
index 1157e1c..839c36c 100644
--- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveReferenceTestGenerated.java
+++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/resolver/Fe10IdeNormalAnalysisSourceModuleResolveReferenceTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveCallTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveCallTestGenerated.java
index 6210728..515c28a 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveCallTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveCallTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveCandidatesTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveCandidatesTestGenerated.java
index 84064aa..d7317c7 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveCandidatesTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveCandidatesTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveReferenceTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveReferenceTestGenerated.java
index cea196e..80a3cda 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveReferenceTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisLibrarySourceModuleResolveReferenceTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java
index ff5d720..6e1248b 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveCallTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java
index 9628797..9fbd6a4 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveReferenceTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveReferenceTestGenerated.java
index 9603464..bf6ff64 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveReferenceTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/resolver/FirIdeNormalAnalysisSourceModuleResolveReferenceTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt
index 91c6266..5b29a6a 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt
@@ -454,7 +454,7 @@
renderer.with {
typeRenderer = typeRenderer.with {
expandedTypeRenderingMode = KaExpandedTypeRenderingMode.RENDER_EXPANDED_TYPE
- functionalTypeRenderer = KaFunctionalTypeRenderer.AS_CLASS_TYPE_FOR_REFLECTION_TYPES
+ functionalTypeRenderer = KaFunctionalTypeRenderer.AS_CLASS_TYPE_FOR_REFLECTION_TYPES_WITH_PARAMETER_NAMES
}
}
}
diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveCallTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveCallTestGenerated.java
index 0626ac5..f41c431 100644
--- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveCallTestGenerated.java
+++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveCallTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java
index f54721b..7205e5a 100644
--- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java
+++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveCandidatesTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveReferenceTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveReferenceTestGenerated.java
index 6355335..7014839 100644
--- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveReferenceTestGenerated.java
+++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/resolver/FirStandaloneNormalAnalysisSourceModuleResolveReferenceTestGenerated.java
@@ -1535,6 +1535,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
diff --git a/analysis/analysis-api/api/analysis-api.undocumented b/analysis/analysis-api/api/analysis-api.undocumented
index 0e3468d..931a1f5 100644
--- a/analysis/analysis-api/api/analysis-api.undocumented
+++ b/analysis/analysis-api/api/analysis-api.undocumented
@@ -503,7 +503,9 @@
renderer/types/impl/KaTypeRendererForDebug.kt:KaTypeRendererForDebug:WITH_SHORT_NAMES
renderer/types/impl/KaTypeRendererForSource.kt:@KaExperimentalApi KaTypeRendererForSource
renderer/types/impl/KaTypeRendererForSource.kt:KaTypeRendererForSource:WITH_QUALIFIED_NAMES
+renderer/types/impl/KaTypeRendererForSource.kt:KaTypeRendererForSource:WITH_QUALIFIED_NAMES_WITHOUT_PARAMETER_NAMES
renderer/types/impl/KaTypeRendererForSource.kt:KaTypeRendererForSource:WITH_SHORT_NAMES
+renderer/types/impl/KaTypeRendererForSource.kt:KaTypeRendererForSource:WITH_SHORT_NAMES_WITHOUT_PARAMETER_NAMES
renderer/types/renderers/KaCapturedTypeRenderer.kt:@KaExperimentalApi KaCapturedTypeRenderer
renderer/types/renderers/KaCapturedTypeRenderer.kt:KaCapturedTypeRenderer:@KaExperimentalApi AS_CAPTURED_TYPE_WITH_PROJECTION
renderer/types/renderers/KaCapturedTypeRenderer.kt:KaCapturedTypeRenderer:@KaExperimentalApi AS_PROJECTION
@@ -526,7 +528,9 @@
renderer/types/renderers/KaFunctionalTypeRenderer.kt:@KaExperimentalApi KaFunctionalTypeRenderer
renderer/types/renderers/KaFunctionalTypeRenderer.kt:KaFunctionalTypeRenderer:@KaExperimentalApi AS_CLASS_TYPE
renderer/types/renderers/KaFunctionalTypeRenderer.kt:KaFunctionalTypeRenderer:@KaExperimentalApi AS_CLASS_TYPE_FOR_REFLECTION_TYPES
+renderer/types/renderers/KaFunctionalTypeRenderer.kt:KaFunctionalTypeRenderer:@KaExperimentalApi AS_CLASS_TYPE_FOR_REFLECTION_TYPES_WITH_PARAMETER_NAMES
renderer/types/renderers/KaFunctionalTypeRenderer.kt:KaFunctionalTypeRenderer:@KaExperimentalApi AS_FUNCTIONAL_TYPE
+renderer/types/renderers/KaFunctionalTypeRenderer.kt:KaFunctionalTypeRenderer:@KaExperimentalApi AS_FUNCTIONAL_TYPE_WITH_PARAMETER_NAMES
renderer/types/renderers/KaFunctionalTypeRenderer.kt:KaFunctionalTypeRenderer:renderType(KaSession, KaFunctionType, KaTypeRenderer, PrettyPrinter)
renderer/types/renderers/KaIntersectionTypeRenderer.kt:@KaExperimentalApi KaIntersectionTypeRenderer
renderer/types/renderers/KaIntersectionTypeRenderer.kt:KaIntersectionTypeRenderer:@KaExperimentalApi AS_INTERSECTION
diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KaTypeRendererForSource.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KaTypeRendererForSource.kt
index 9b49b89..81c0d8a 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KaTypeRendererForSource.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/impl/KaTypeRendererForSource.kt
@@ -22,7 +22,7 @@
definitelyNotNullTypeRenderer = KaDefinitelyNotNullTypeRenderer.AS_TYPE_INTERSECTION
dynamicTypeRenderer = KaDynamicTypeRenderer.AS_DYNAMIC_WORD
flexibleTypeRenderer = KaFlexibleTypeRenderer.AS_SHORT
- functionalTypeRenderer = KaFunctionalTypeRenderer.AS_CLASS_TYPE_FOR_REFLECTION_TYPES
+ functionalTypeRenderer = KaFunctionalTypeRenderer.AS_CLASS_TYPE_FOR_REFLECTION_TYPES_WITH_PARAMETER_NAMES
intersectionTypeRenderer = KaIntersectionTypeRenderer.AS_INTERSECTION
errorTypeRenderer = KaErrorTypeRenderer.AS_CODE_IF_POSSIBLE
typeParameterTypeRenderer = KaTypeParameterTypeRenderer.AS_SOURCE
@@ -37,8 +37,16 @@
keywordsRenderer = KaKeywordsRenderer.AS_WORD
}
+ public val WITH_QUALIFIED_NAMES_WITHOUT_PARAMETER_NAMES: KaTypeRenderer = WITH_QUALIFIED_NAMES.with {
+ functionalTypeRenderer = KaFunctionalTypeRenderer.AS_CLASS_TYPE_FOR_REFLECTION_TYPES
+ }
+
public val WITH_SHORT_NAMES: KaTypeRenderer = WITH_QUALIFIED_NAMES.with {
classIdRenderer = KaClassTypeQualifierRenderer.WITH_SHORT_NAMES_WITH_NESTED_CLASSIFIERS
annotationsRenderer = KaAnnotationRendererForSource.WITH_SHORT_NAMES
}
+
+ public val WITH_SHORT_NAMES_WITHOUT_PARAMETER_NAMES: KaTypeRenderer = WITH_SHORT_NAMES.with {
+ functionalTypeRenderer = KaFunctionalTypeRenderer.AS_CLASS_TYPE_FOR_REFLECTION_TYPES
+ }
}
diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KaFunctionalTypeRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KaFunctionalTypeRenderer.kt
index 0a18664..95b9275 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KaFunctionalTypeRenderer.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/renderer/types/renderers/KaFunctionalTypeRenderer.kt
@@ -31,6 +31,30 @@
typeRenderer: KaTypeRenderer,
printer: PrettyPrinter,
) {
+ AS_FUNCTIONAL_TYPE_WITH_OPTIONAL_PARAMETER_NAMES.renderType(analysisSession, type, typeRenderer, printer, false)
+ }
+ }
+
+ @KaExperimentalApi
+ public object AS_FUNCTIONAL_TYPE_WITH_PARAMETER_NAMES : KaFunctionalTypeRenderer {
+ override fun renderType(
+ analysisSession: KaSession,
+ type: KaFunctionType,
+ typeRenderer: KaTypeRenderer,
+ printer: PrettyPrinter,
+ ) {
+ AS_FUNCTIONAL_TYPE_WITH_OPTIONAL_PARAMETER_NAMES.renderType(analysisSession, type, typeRenderer, printer, true)
+ }
+ }
+
+ private object AS_FUNCTIONAL_TYPE_WITH_OPTIONAL_PARAMETER_NAMES {
+ fun renderType(
+ analysisSession: KaSession,
+ type: KaFunctionType,
+ typeRenderer: KaTypeRenderer,
+ printer: PrettyPrinter,
+ withParameterNames: Boolean
+ ) {
printer {
val annotationsRendered = checkIfPrinted {
typeRenderer.annotationsRenderer.renderAnnotations(analysisSession, type, this)
@@ -56,8 +80,14 @@
if (it is KaFunctionType || it is KaDefinitelyNotNullType) printer.append(")")
printer.append('.')
}
- printCollection(type.parameterTypes, prefix = "(", postfix = ")") {
- typeRenderer.renderType(analysisSession, it, this)
+ printCollection(type.parameters, prefix = "(", postfix = ")") { valueParameter ->
+ if (withParameterNames) {
+ valueParameter.name?.let { name ->
+ typeRenderer.typeNameRenderer.renderName(analysisSession, name, valueParameter.type, typeRenderer, this)
+ append(": ")
+ }
+ }
+ typeRenderer.renderType(analysisSession, valueParameter.type, this)
}
append(" -> ")
typeRenderer.renderType(analysisSession, type.returnType, printer)
@@ -101,4 +131,17 @@
renderer.renderType(analysisSession, type, typeRenderer, printer)
}
}
+
+ @KaExperimentalApi
+ public object AS_CLASS_TYPE_FOR_REFLECTION_TYPES_WITH_PARAMETER_NAMES : KaFunctionalTypeRenderer {
+ override fun renderType(
+ analysisSession: KaSession,
+ type: KaFunctionType,
+ typeRenderer: KaTypeRenderer,
+ printer: PrettyPrinter,
+ ) {
+ val renderer = if (type.isReflectType) AS_CLASS_TYPE else AS_FUNCTIONAL_TYPE_WITH_PARAMETER_NAMES
+ renderer.renderType(analysisSession, type, typeRenderer, printer)
+ }
+ }
}
diff --git a/analysis/analysis-api/testData/components/resolver/allByPsi/imports/simple.references.txt b/analysis/analysis-api/testData/components/resolver/allByPsi/imports/simple.references.txt
index b8a61ea..900cc2d 100644
--- a/analysis/analysis-api/testData/components/resolver/allByPsi/imports/simple.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/allByPsi/imports/simple.references.txt
@@ -12,7 +12,7 @@
KtNameReferenceExpression(73,84): 'MutableList'
KtSimpleNameReference:
- 0: (in kotlin.collections) inline fun <T> MutableList(size: kotlin.Int, init: (kotlin.Int) -> T): kotlin.collections.MutableList<T>
+ 0: (in kotlin.collections) inline fun <T> MutableList(size: kotlin.Int, init: (index: kotlin.Int) -> T): kotlin.collections.MutableList<T>
1: (in kotlin.collections) interface MutableList<E> : kotlin.collections.List<E>, kotlin.collections.MutableCollection<E>
KtNameReferenceExpression(92,98): 'kotlin'
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.call.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.call.txt
new file mode 100644
index 0000000..7f13708
--- /dev/null
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.call.txt
@@ -0,0 +1,64 @@
+KtCallExpression(66,80): 'x(1, "", true)'
+ KaSuccessCallInfo:
+ call = KaSimpleFunctionCall:
+ argumentMapping = {
+ 1 -> (KaVariableSignature:
+ name = fun
+ receiverType = null
+ returnType = @R|kotlin.ParameterName|(name = String(fun)) kotlin.Int
+ symbol = p1: P1
+ contextParameters = []
+ callableId = null),
+ "" -> (KaVariableSignature:
+ name = p2
+ receiverType = null
+ returnType = kotlin.String
+ symbol = p2: P2
+ contextParameters = []
+ callableId = null),
+ true -> (KaVariableSignature:
+ name = class
+ receiverType = null
+ returnType = @R|kotlin.ParameterName|(name = String(class)) kotlin.Boolean
+ symbol = p3: P3
+ contextParameters = []
+ callableId = null)
+ }
+ isImplicitInvoke = true
+ partiallyAppliedSymbol = KaPartiallyAppliedSymbol:
+ contextArguments = []
+ dispatchReceiver = KaExplicitReceiverValue:
+ expression = x
+ isSafeNavigation = false
+ type = kotlin.Function3<@R|kotlin.ParameterName|(name = String(fun)) kotlin.Int, kotlin.String, @R|kotlin.ParameterName|(name = String(class)) kotlin.Boolean, kotlin.Unit>
+ extensionReceiver = null
+ signature = KaFunctionSignature:
+ receiverType = null
+ returnType = kotlin.Unit
+ symbol = kotlin/Function3.invoke(<dispatch receiver>: kotlin.Function3<P1, P2, P3, R>, p1: P1, p2: P2, p3: P3): R
+ valueParameters = [
+ KaVariableSignature:
+ name = fun
+ receiverType = null
+ returnType = @R|kotlin.ParameterName|(name = String(fun)) kotlin.Int
+ symbol = p1: P1
+ contextParameters = []
+ callableId = null,
+ KaVariableSignature:
+ name = p2
+ receiverType = null
+ returnType = kotlin.String
+ symbol = p2: P2
+ contextParameters = []
+ callableId = null,
+ KaVariableSignature:
+ name = class
+ receiverType = null
+ returnType = @R|kotlin.ParameterName|(name = String(class)) kotlin.Boolean
+ symbol = p3: P3
+ contextParameters = []
+ callableId = null
+ ]
+ contextParameters = []
+ callableId = kotlin/Function3.invoke
+ typeArgumentsMapping = {}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.candidates.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.candidates.txt
new file mode 100644
index 0000000..0a2e1b6
--- /dev/null
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.candidates.txt
@@ -0,0 +1,65 @@
+KtCallExpression(66,80): 'x(1, "", true)'
+ KaApplicableCallCandidateInfo:
+ candidate = KaSimpleFunctionCall:
+ argumentMapping = {
+ 1 -> (KaVariableSignature:
+ name = fun
+ receiverType = null
+ returnType = @R|kotlin.ParameterName|(name = String(fun)) kotlin.Int
+ symbol = p1: P1
+ contextParameters = []
+ callableId = null),
+ "" -> (KaVariableSignature:
+ name = p2
+ receiverType = null
+ returnType = kotlin.String
+ symbol = p2: P2
+ contextParameters = []
+ callableId = null),
+ true -> (KaVariableSignature:
+ name = class
+ receiverType = null
+ returnType = @R|kotlin.ParameterName|(name = String(class)) kotlin.Boolean
+ symbol = p3: P3
+ contextParameters = []
+ callableId = null)
+ }
+ isImplicitInvoke = true
+ partiallyAppliedSymbol = KaPartiallyAppliedSymbol:
+ contextArguments = []
+ dispatchReceiver = KaExplicitReceiverValue:
+ expression = x
+ isSafeNavigation = false
+ type = kotlin.Function3<@R|kotlin.ParameterName|(name = String(fun)) kotlin.Int, kotlin.String, @R|kotlin.ParameterName|(name = String(class)) kotlin.Boolean, kotlin.Unit>
+ extensionReceiver = null
+ signature = KaFunctionSignature:
+ receiverType = null
+ returnType = kotlin.Unit
+ symbol = kotlin/Function3.invoke(<dispatch receiver>: kotlin.Function3<P1, P2, P3, R>, p1: P1, p2: P2, p3: P3): R
+ valueParameters = [
+ KaVariableSignature:
+ name = fun
+ receiverType = null
+ returnType = @R|kotlin.ParameterName|(name = String(fun)) kotlin.Int
+ symbol = p1: P1
+ contextParameters = []
+ callableId = null,
+ KaVariableSignature:
+ name = p2
+ receiverType = null
+ returnType = kotlin.String
+ symbol = p2: P2
+ contextParameters = []
+ callableId = null,
+ KaVariableSignature:
+ name = class
+ receiverType = null
+ returnType = @R|kotlin.ParameterName|(name = String(class)) kotlin.Boolean
+ symbol = p3: P3
+ contextParameters = []
+ callableId = null
+ ]
+ contextParameters = []
+ callableId = kotlin/Function3.invoke
+ typeArgumentsMapping = {}
+ isInBestCandidates = true
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.descriptors.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.descriptors.references.txt
new file mode 100644
index 0000000..68379d2
--- /dev/null
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.descriptors.references.txt
@@ -0,0 +1,6 @@
+KtNameReferenceExpression(66,67): 'x'
+ KtSimpleNameReference:
+ x: (`fun`: kotlin.Int, kotlin.String, `class`: kotlin.Boolean) -> kotlin.Unit
+
+ SyntheticPropertyAccessorReference:
+ Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt
new file mode 100644
index 0000000..69a6c25
--- /dev/null
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt
@@ -0,0 +1,3 @@
+fun call(x: (`fun`: Int, String, `class`: Boolean) -> Unit) {
+ <expr>x(1, "", true)</expr>
+}
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.references.txt
new file mode 100644
index 0000000..d5b7741
--- /dev/null
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.references.txt
@@ -0,0 +1,3 @@
+KtNameReferenceExpression(66,67): 'x'
+ KtSimpleNameReference:
+ x: (`fun`: kotlin.Int, kotlin.String, `class`: kotlin.Boolean) -> kotlin.Unit
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.descriptors.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.descriptors.references.txt
index 97c3e1a..d05f028 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.descriptors.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.descriptors.references.txt
@@ -1,6 +1,6 @@
KtNameReferenceExpression(47,48): 'x'
KtSimpleNameReference:
- x: (kotlin.Int, kotlin.String) -> kotlin.Unit
-
+ x: (a: kotlin.Int, b: kotlin.String) -> kotlin.Unit
+
SyntheticPropertyAccessorReference:
Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.references.txt
index 305b691..1547926 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.references.txt
@@ -1,3 +1,3 @@
KtNameReferenceExpression(47,48): 'x'
KtSimpleNameReference:
- x: (kotlin.Int, kotlin.String) -> kotlin.Unit
\ No newline at end of file
+ x: (a: kotlin.Int, b: kotlin.String) -> kotlin.Unit
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotation.descriptors.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotation.descriptors.references.txt
index 34dad4f..36929b2 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotation.descriptors.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotation.descriptors.references.txt
@@ -1,6 +1,6 @@
KtNameReferenceExpression(88,89): 'x'
KtSimpleNameReference:
- x: (kotlin.Int, kotlin.String) -> kotlin.Unit
-
+ x: (a: kotlin.Int, b: kotlin.String) -> kotlin.Unit
+
SyntheticPropertyAccessorReference:
Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotation.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotation.references.txt
index e5e4c10..c92264e 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotation.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotation.references.txt
@@ -1,3 +1,3 @@
KtNameReferenceExpression(88,89): 'x'
KtSimpleNameReference:
- x: (kotlin.Int, kotlin.String) -> kotlin.Unit
\ No newline at end of file
+ x: (a: kotlin.Int, b: kotlin.String) -> kotlin.Unit
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.references.txt
index 942c511..d2388d0 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotationConflict.descriptors.references.txt
@@ -1,6 +1,6 @@
KtNameReferenceExpression(182,183): 'x'
KtSimpleNameReference:
- x: (kotlin.Int, kotlin.String) -> kotlin.Unit
-
+ x: (a: kotlin.Int, b: kotlin.String) -> kotlin.Unit
+
SyntheticPropertyAccessorReference:
Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotationConflict.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotationConflict.references.txt
index 3772ac2..f7ab9e0 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotationConflict.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameAnnotationConflict.references.txt
@@ -1,3 +1,3 @@
KtNameReferenceExpression(182,183): 'x'
KtSimpleNameReference:
- x: (kotlin.Int, kotlin.String) -> kotlin.Unit
\ No newline at end of file
+ x: (a: kotlin.Int, b: kotlin.String) -> kotlin.Unit
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameGeneric.descriptors.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameGeneric.descriptors.references.txt
index 6c20822..aff9912 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameGeneric.descriptors.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameGeneric.descriptors.references.txt
@@ -1,6 +1,6 @@
KtNameReferenceExpression(81,82): 'x'
KtSimpleNameReference:
- (in <local>: call) val x: (kotlin.Int) -> kotlin.Unit
-
+ (in <local>: call) val x: (a: kotlin.Int) -> kotlin.Unit
+
SyntheticPropertyAccessorReference:
Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameGeneric.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameGeneric.references.txt
index b9d0078..4696175 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameGeneric.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameGeneric.references.txt
@@ -1,3 +1,3 @@
KtNameReferenceExpression(81,82): 'x'
KtSimpleNameReference:
- (in <local>: call) val x: (kotlin.Int) -> kotlin.Unit
\ No newline at end of file
+ (in <local>: call) val x: (a: kotlin.Int) -> kotlin.Unit
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameMixed.descriptors.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameMixed.descriptors.references.txt
index 579562c..50598a8 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameMixed.descriptors.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameMixed.descriptors.references.txt
@@ -1,6 +1,6 @@
KtNameReferenceExpression(44,45): 'x'
KtSimpleNameReference:
- x: (kotlin.Int, kotlin.String) -> kotlin.Unit
-
+ x: (a: kotlin.Int, kotlin.String) -> kotlin.Unit
+
SyntheticPropertyAccessorReference:
Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameMixed.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameMixed.references.txt
index 4e61486..192b864 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameMixed.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterNameMixed.references.txt
@@ -1,3 +1,3 @@
KtNameReferenceExpression(44,45): 'x'
KtSimpleNameReference:
- x: (kotlin.Int, kotlin.String) -> kotlin.Unit
\ No newline at end of file
+ x: (a: kotlin.Int, kotlin.String) -> kotlin.Unit
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.references.txt
index 1da9cf5..6798a5d 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/variableAsFunctionWithParameterNameAnnotationConflict2.descriptors.references.txt
@@ -1,6 +1,6 @@
KtNameReferenceExpression(165,166): 'x'
KtSimpleNameReference:
- x: (kotlin.Int) -> kotlin.Unit
-
+ x: (first: kotlin.Int) -> kotlin.Unit
+
SyntheticPropertyAccessorReference:
Nothing (Unresolved reference)
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/variableAsFunctionWithParameterNameAnnotationConflict2.references.txt b/analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/variableAsFunctionWithParameterNameAnnotationConflict2.references.txt
index 64f8f14..1bca735 100644
--- a/analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/variableAsFunctionWithParameterNameAnnotationConflict2.references.txt
+++ b/analysis/analysis-api/testData/components/resolver/singleByPsi/withErrors/variableAsFunctionWithParameterNameAnnotationConflict2.references.txt
@@ -1,3 +1,3 @@
KtNameReferenceExpression(165,166): 'x'
KtSimpleNameReference:
- x: (kotlin.Int) -> kotlin.Unit
\ No newline at end of file
+ x: (first: kotlin.Int) -> kotlin.Unit
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/SourceResolveCandidatesFirTreeConsistencyTestGenerated.java b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/SourceResolveCandidatesFirTreeConsistencyTestGenerated.java
index 2467ace..fbf75bc 100644
--- a/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/SourceResolveCandidatesFirTreeConsistencyTestGenerated.java
+++ b/analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/resolve/SourceResolveCandidatesFirTreeConsistencyTestGenerated.java
@@ -1513,6 +1513,12 @@
}
@Test
+ @TestMetadata("variableAsFunctionWithKeywordParameterName.kt")
+ public void testVariableAsFunctionWithKeywordParameterName() {
+ runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithKeywordParameterName.kt");
+ }
+
+ @Test
@TestMetadata("variableAsFunctionWithParameterName.kt")
public void testVariableAsFunctionWithParameterName() {
runTest("analysis/analysis-api/testData/components/resolver/singleByPsi/variableAsFunctionWithParameterName.kt");
