azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[LC] do not store name identifier as property

Browse Source 
^KT-56613
This commit is contained in:
Dmitrii Gridin
2023-02-23 17:49:18 +01:00
committed by Space Team
parent 327208fb8a
commit 58dc93da90
11 changed files with 26 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassLike.kt
+1 -4
View File
@@ -75,11 +75,8 @@ abstract class SymbolLightClassForClassLike<SType : KtClassOrObjectSymbol> prote
abstract override fun getOwnFields(): List<KtLightField>
abstract override fun getOwnMethods(): List<PsiMethod>
private val _identifier: PsiIdentifier by lazyPub {
KtLightIdentifier(this, classOrObjectDeclaration)
}
override fun getNameIdentifier(): PsiIdentifier? = _identifier
override fun getNameIdentifier(): PsiIdentifier? = KtLightIdentifier(this, classOrObjectDeclaration)
abstract override fun getExtendsList(): PsiReferenceList?
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt
+1 -5
View File
@@ -134,12 +134,8 @@ internal class SymbolLightClassForEnumEntry(
return super.isInheritor(baseClass, checkDeep = true)
}
private val _identifier: PsiIdentifier by lazyPub {
KtLightIdentifier(this, kotlinOrigin)
}
// probably should be dropped after KT-54798
override fun getNameIdentifier(): PsiIdentifier = _identifier
override fun getNameIdentifier(): PsiIdentifier = KtLightIdentifier(this, kotlinOrigin)
override fun getName(): String? = kotlinOrigin.name
override fun isDeprecated(): Boolean = false
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightField.kt
+1 -6
View File
@@ -14,7 +14,6 @@ import com.intellij.util.PlatformIcons
import org.jetbrains.annotations.NonNls
import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
import org.jetbrains.kotlin.asJava.classes.cannotModify
import org.jetbrains.kotlin.asJava.classes.lazyPub
import org.jetbrains.kotlin.asJava.elements.KtLightField
import org.jetbrains.kotlin.asJava.elements.KtLightIdentifier
import org.jetbrains.kotlin.idea.KotlinLanguage
@@ -37,11 +36,7 @@ internal abstract class SymbolLightField protected constructor(
override fun hasInitializer(): Boolean = initializer !== null
private val _identifier: PsiIdentifier by lazyPub {
KtLightIdentifier(this, kotlinOrigin)
}
override fun getNameIdentifier(): PsiIdentifier = _identifier
override fun getNameIdentifier(): PsiIdentifier = KtLightIdentifier(this, kotlinOrigin)
override fun computeConstantValue(): Any? = null
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt
+1 -5
View File
@@ -229,11 +229,7 @@ internal class SymbolLightAccessorMethod private constructor(
override fun isDeprecated(): Boolean = _isDeprecated
private val _identifier: PsiIdentifier by lazyPub {
KtLightIdentifier(this, containingPropertyDeclaration)
}
override fun getNameIdentifier(): PsiIdentifier = _identifier
override fun getNameIdentifier(): PsiIdentifier = KtLightIdentifier(this, containingPropertyDeclaration)
private val _returnedType: PsiType by lazyPub {
if (!isGetter) return@lazyPub PsiType.VOID
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightMethod.kt
+1 -5
View File
@@ -108,10 +108,6 @@ internal abstract class SymbolLightMethod<FType : KtFunctionLikeSymbol> private
}
}
private val _identifier: PsiIdentifier by lazyPub {
KtLightIdentifier(this, functionDeclaration)
}
private val _isDeprecated: Boolean by lazyPub {
withFunctionSymbol { functionSymbol ->
functionSymbol.hasDeprecatedAnnotation()
@@ -120,7 +116,7 @@ internal abstract class SymbolLightMethod<FType : KtFunctionLikeSymbol> private
override fun isDeprecated(): Boolean = _isDeprecated
override fun getNameIdentifier(): PsiIdentifier = _identifier
override fun getNameIdentifier(): PsiIdentifier = KtLightIdentifier(this, functionDeclaration)
override fun getParameterList(): PsiParameterList = _parametersList
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightNoArgConstructor.kt
+1 -5
View File
@@ -28,11 +28,7 @@ internal class SymbolLightNoArgConstructor(
override fun getTypeParameterList(): PsiTypeParameterList? = null
override fun getTypeParameters(): Array<PsiTypeParameter> = PsiTypeParameter.EMPTY_ARRAY
private val _identifier: PsiIdentifier by lazyPub {
KtLightIdentifier(this, ktDeclaration = null)
}
override fun getNameIdentifier(): PsiIdentifier = _identifier
override fun getNameIdentifier(): PsiIdentifier = KtLightIdentifier(this, ktDeclaration = null)
override fun isDeprecated(): Boolean = false
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightParameterCommon.kt
+1 -5
View File
@@ -48,10 +48,6 @@ internal abstract class SymbolLightParameterCommon(
abstract override fun getModifierList(): PsiModifierList
private val _identifier: PsiIdentifier by lazyPub {
KtLightIdentifier(this, parameterDeclaration)
}
protected fun nullabilityType(): NullabilityType {
if (isVarArgs) return NullabilityType.NotNull
@@ -65,7 +61,7 @@ internal abstract class SymbolLightParameterCommon(
}
}
override fun getNameIdentifier(): PsiIdentifier = _identifier
override fun getNameIdentifier(): PsiIdentifier = KtLightIdentifier(this, parameterDeclaration)
private val _type by lazyPub {
parameterSymbolPointer.withSymbol(ktModule) { parameterSymbol ->