From b1b33475fadce0e23b7833f54eeedaf05b0dbdca Mon Sep 17 00:00:00 2001
From: Dmitrii Gridin <dmitry.gridin@jetbrains.com>
Date: Mon, 29 Jan 2024 15:19:10 +0100
Subject: [PATCH] [SLC] SymbolLightParameterCommon: drop redundant
 parameterDeclaration

Now we can replace it with kotlinOrigin

^KT-64772
---
 .../symbol/parameters/SymbolLightParameterCommon.kt  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterCommon.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterCommon.kt
index b32e969cdfb..ab17e03bc93 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterCommon.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterCommon.kt
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.psi.KtParameter
 
 internal abstract class SymbolLightParameterCommon(
     protected val parameterSymbolPointer: KtSymbolPointer<KtValueParameterSymbol>,
-    protected val parameterDeclaration: KtParameter?,
     private val containingMethod: SymbolLightMethodBase,
     override val kotlinOrigin: KtParameter?,
 ) : SymbolLightParameterBase(containingMethod) {
@@ -30,7 +29,6 @@ internal abstract class SymbolLightParameterCommon(
         containingMethod: SymbolLightMethodBase,
     ) : this(
         parameterSymbolPointer = with(ktAnalysisSession) { parameterSymbol.createPointer() },
-        parameterDeclaration = parameterSymbol.sourcePsiSafe(),
         containingMethod = containingMethod,
         kotlinOrigin = parameterSymbol.sourcePsiSafe(),
     )
@@ -72,7 +70,7 @@ internal abstract class SymbolLightParameterCommon(
         }
     }
 
-    override fun getNameIdentifier(): PsiIdentifier = KtLightIdentifier(this, parameterDeclaration)
+    override fun getNameIdentifier(): PsiIdentifier = KtLightIdentifier(this, kotlinOrigin)
 
     private val _type by lazyPub {
         parameterSymbolPointer.withSymbol(ktModule) { parameterSymbol ->
@@ -108,13 +106,13 @@ internal abstract class SymbolLightParameterCommon(
         if (this === other) return true
         if (other !is SymbolLightParameterCommon || other.ktModule != ktModule) return false
 
-        if (parameterDeclaration != null || other.parameterDeclaration != null) {
-            return parameterDeclaration == other.parameterDeclaration
+        if (kotlinOrigin != null || other.kotlinOrigin != null) {
+            return kotlinOrigin == other.kotlinOrigin
         }
 
         return compareSymbolPointers(parameterSymbolPointer, other.parameterSymbolPointer)
     }
 
-    override fun hashCode(): Int = parameterDeclaration?.hashCode() ?: _name.hashCode()
-    override fun isValid(): Boolean = super.isValid() && parameterDeclaration?.isValid ?: parameterSymbolPointer.isValid(ktModule)
+    override fun hashCode(): Int = kotlinOrigin?.hashCode() ?: _name.hashCode()
+    override fun isValid(): Boolean = super.isValid() && kotlinOrigin?.isValid ?: parameterSymbolPointer.isValid(ktModule)
 }