KSP2: fix KSValueParameter.isVal and isVar

ting-yuan · KSP Auto Pick · commit 00dbaf8befaf · 2025-03-14T23:40:30.000Z
for symbols from libraries. (cherry picked from commit a8a204f)
diff --git a/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSValueParameterImpl.kt b/kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/KSValueParameterImpl.kt
@@ -24,6 +24,10 @@ import com.google.devtools.ksp.common.lazyMemoizedSequence
 import com.google.devtools.ksp.impl.symbol.kotlin.resolved.KSTypeReferenceResolvedImpl
 import com.google.devtools.ksp.symbol.*
 import org.jetbrains.kotlin.analysis.api.fir.symbols.KaFirValueParameterSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaClassSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaConstructorSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaPropertySymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KaSymbolOrigin
 import org.jetbrains.kotlin.analysis.api.symbols.KaValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.types.abbreviationOrSelf
 import org.jetbrains.kotlin.fir.java.JavaTypeParameterStack
@@ -77,11 +81,26 @@ class KSValueParameterImpl private constructor(
     override val isCrossInline: Boolean
         get() = ktValueParameterSymbol.isCrossinline
 
+    private val KaValueParameterSymbol.primaryConstructorProperty: KaPropertySymbol? by lazy {
+        when (ktValueParameterSymbol.origin) {
+            // ktValueParameterSymbol.generatedPrimaryConstructorProperty is always null in libraries.
+            // TODO: fix in AA
+            KaSymbolOrigin.LIBRARY, KaSymbolOrigin.JAVA_LIBRARY -> analyze {
+                val cstr = ktValueParameterSymbol.containingDeclaration as? KaConstructorSymbol
+                val cls = cstr?.containingDeclaration as? KaClassSymbol
+                cls?.declaredMemberScope?.declarations?.filterIsInstance<KaPropertySymbol>()
+                    ?.firstOrNull { it.name == ktValueParameterSymbol.name }
+            }
+
+            else -> ktValueParameterSymbol.generatedPrimaryConstructorProperty
+        }
+    }
+
     override val isVal: Boolean
-        get() = (ktValueParameterSymbol.psi as? KtParameter)?.let { it.hasValOrVar() && !it.isMutable } ?: false
+        get() = ktValueParameterSymbol.primaryConstructorProperty?.isVal == true
 
     override val isVar: Boolean
-        get() = (ktValueParameterSymbol.psi as? KtParameter)?.let { it.hasValOrVar() && it.isMutable } ?: false
+        get() = ktValueParameterSymbol.primaryConstructorProperty?.isVal == false
 
     override val hasDefault: Boolean by lazy {
         ktValueParameterSymbol.hasDefaultValue
diff --git a/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/processor/ValueParameterProcessor.kt b/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/processor/ValueParameterProcessor.kt
@@ -0,0 +1,23 @@
+package com.google.devtools.ksp.processor
+
+import com.google.devtools.ksp.getClassDeclarationByName
+import com.google.devtools.ksp.processing.Resolver
+import com.google.devtools.ksp.symbol.KSAnnotated
+
+class ValueParameterProcessor : AbstractTestProcessor() {
+    val results = mutableListOf<String>()
+
+    override fun toResult(): List<String> {
+        return results
+    }
+
+    override fun process(resolver: Resolver): List<KSAnnotated> {
+        for (clsName in listOf("MyClassSrc", "MyClassLib")) {
+            val clsDecl = resolver.getClassDeclarationByName(clsName)!!
+            clsDecl.primaryConstructor!!.parameters.sortedBy { it.name!!.asString() }.forEach {
+                results.add("$clsName.${it.name!!.asString()}: isVal: ${it.isVal}, isVar: ${it.isVar}")
+            }
+        }
+        return emptyList()
+    }
+}
diff --git a/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPAATest.kt b/kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/KSPAATest.kt
@@ -684,6 +684,12 @@ class KSPAATest : AbstractKSPAATest() {
         runTest("../kotlin-analysis-api/testData/typeParameterVariance.kt")
     }
 
+    @TestMetadata("valueParameter.kt")
+    @Test
+    fun testValueParameter() {
+        runTest("../kotlin-analysis-api/testData/valueParameter.kt")
+    }
+
     @TestMetadata("varianceTypeCheck.kt")
     @Test
     fun testVarianceTypeCheck() {
diff --git a/kotlin-analysis-api/testData/valueParameter.kt b/kotlin-analysis-api/testData/valueParameter.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2025 Google LLC
+ * Copyright 2010-2025 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// TEST PROCESSOR: ValueParameterProcessor
+// EXPECTED:
+// MyClassSrc.field: isVal: false, isVar: false
+// MyClassSrc.valField: isVal: true, isVar: false
+// MyClassSrc.varField: isVal: false, isVar: true
+// MyClassLib.field: isVal: false, isVar: false
+// MyClassLib.valField: isVal: true, isVar: false
+// MyClassLib.varField: isVal: false, isVar: true
+// END
+
+// MODULE: lib
+// FILE: lib.kt
+
+class MyClassLib(
+    field: String,
+    val valField: String,
+    var varField: String,
+)
+
+// MODULE: main(lib)
+// FILE: main.kt
+
+class MyClassSrc(
+    field: String,
+    val valField: String,
+    var varField: String,
+)
+
