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

[FIR IDE] LC add jvmstatic method into companion object

Browse Source
This commit is contained in:
Igor Yakovlev
2020-12-08 02:28:30 +03:00
parent d32d0a65f0
commit 3895ad375c
9 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightAnnotationClassSymbol.kt
+1 -1
View File
@@ -47,7 +47,7 @@ internal class FirLightAnnotationClassSymbol(
.filterNot { it is KtFunctionSymbol && it.visibility == KtSymbolVisibility.PRIVATE }
.filterNot { it is KtConstructorSymbol }
createMethods(visibleDeclarations, isTopLevel = false, result)
createMethods(visibleDeclarations, result)
}
result
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightAnonymousClassForSymbol.kt
+1 -1
View File
@@ -60,7 +60,7 @@ internal class FirLightAnonymousClassForSymbol(
analyzeWithSymbolAsContext(anonymousObjectSymbol) {
val callableSymbols = anonymousObjectSymbol.getDeclaredMemberScope().getCallableSymbols()
createMethods(callableSymbols, isTopLevel = false, result)
createMethods(callableSymbols, result)
}
result
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassForEnumEntry.kt
+1 -1
View File
@@ -128,7 +128,7 @@ internal class FirLightClassForEnumEntry(
analyzeWithSymbolAsContext(enumEntrySymbol) {
val callableSymbols = enumEntrySymbol.getDeclaredMemberScope().getCallableSymbols()
createMethods(callableSymbols, isTopLevel = false, result)
createMethods(callableSymbols, result)
}
return result
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassForFacade.kt
+1 -1
View File
@@ -82,7 +82,7 @@ class FirLightClassForFacade(
}
}
createMethods(symbols.asSequence(), isTopLevel = true, result)
createMethods(symbols.asSequence(), result, isTopLevel = true)
}
private val _ownMethods: List<KtLightMethod> by lazyPub {
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightClassForSymbol.kt
+17 -1
View File
@@ -6,6 +6,8 @@
package org.jetbrains.kotlin.idea.asJava
import com.intellij.psi.*
import org.jetbrains.kotlin.asJava.builder.memberIndex
import org.jetbrains.kotlin.asJava.classes.METHOD_INDEX_BASE
import org.jetbrains.kotlin.asJava.classes.METHOD_INDEX_FOR_DEFAULT_CTOR
import org.jetbrains.kotlin.asJava.classes.lazyPub
import org.jetbrains.kotlin.asJava.elements.KtLightField
@@ -100,7 +102,8 @@ internal open class FirLightClassForSymbol(
}
}
createMethods(visibleDeclarations, isTopLevel = false, result)
val suppressStatic = classOrObjectSymbol.classKind == KtClassKind.COMPANION_OBJECT
createMethods(visibleDeclarations, result, suppressStaticForMethods = suppressStatic)
}
if (result.none { it.isConstructor }) {
@@ -116,6 +119,8 @@ internal open class FirLightClassForSymbol(
}
}
addMethodsFromCompanionIfNeeded(result)
result
}
@@ -140,6 +145,17 @@ internal open class FirLightClassForSymbol(
}
}
private fun addMethodsFromCompanionIfNeeded(result: MutableList<KtLightMethod>) {
classOrObjectSymbol.companionObject?.run {
analyzeWithSymbolAsContext(this) {
val methods = getDeclaredMemberScope().getCallableSymbols()
.filterIsInstance<KtFunctionSymbol>()
.filter { it.hasJvmStaticAnnotation() }
createMethods(methods, result)
}
}
}
private fun addInstanceFieldIfNeeded(result: MutableList<KtLightField>) {
val isNamedObject = classOrObjectSymbol.classKind == KtClassKind.OBJECT
if (isNamedObject && classOrObjectSymbol.symbolKind != KtSymbolKind.LOCAL) {
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/FirLightInterfaceClassSymbol.kt
+1 -1
View File
@@ -43,7 +43,7 @@ internal class FirLightInterfaceClassSymbol(
val visibleDeclarations = classOrObjectSymbol.getDeclaredMemberScope().getCallableSymbols()
.filterNot { it is KtFunctionSymbol && it.visibility == KtSymbolVisibility.PRIVATE }
createMethods(visibleDeclarations, isTopLevel = false, result)
createMethods(visibleDeclarations, result)
}
result
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/classes/firLightClassUtils.kt
+7 -5
View File
@@ -98,10 +98,10 @@ private fun lightClassForEnumEntry(ktEnumEntry: KtEnumEntry): KtLightClass? {
internal fun FirLightClassBase.createMethods(
declarations: Sequence<KtCallableSymbol>,
isTopLevel: Boolean,
result: MutableList<KtLightMethod>
result: MutableList<KtLightMethod>,
isTopLevel: Boolean = false,
suppressStaticForMethods: Boolean = false
) {
var methodIndex = METHOD_INDEX_BASE
for (declaration in declarations) {
if (declaration is KtFunctionSymbol && declaration.isInline) continue
@@ -112,13 +112,15 @@ internal fun FirLightClassBase.createMethods(
when (declaration) {
is KtFunctionSymbol -> {
var methodIndex = METHOD_INDEX_BASE
result.add(
FirLightSimpleMethodForSymbol(
functionSymbol = declaration,
lightMemberOrigin = null,
containingClass = this@createMethods,
isTopLevel = isTopLevel,
methodIndex = methodIndex++
methodIndex = methodIndex,
suppressStatic = suppressStaticForMethods
)
)
@@ -150,7 +152,7 @@ internal fun FirLightClassBase.createMethods(
constructorSymbol = declaration,
lightMemberOrigin = null,
containingClass = this@createMethods,
methodIndex++
methodIndex = METHOD_INDEX_BASE
)
)
}
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightAccessorMethodForSymbol.kt
+1
View File
@@ -139,6 +139,7 @@ internal class FirLightAccessorMethodForSymbol(
override fun equals(other: Any?): Boolean =
this === other ||
(other is FirLightAccessorMethodForSymbol &&
isGetter == other.isGetter &&
kotlinOrigin == other.kotlinOrigin &&
propertyAccessorSymbol == other.propertyAccessorSymbol)
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/methods/FirLightSimpleMethodForSymbol.kt
+4 -3
View File
@@ -22,13 +22,14 @@ internal class FirLightSimpleMethodForSymbol(
containingClass: FirLightClassBase,
methodIndex: Int,
isTopLevel: Boolean,
argumentsSkipMask: BitSet? = null
argumentsSkipMask: BitSet? = null,
suppressStatic: Boolean = false
) : FirLightMethodForSymbol(
functionSymbol = functionSymbol,
lightMemberOrigin = lightMemberOrigin,
containingClass = containingClass,
methodIndex = methodIndex,
argumentsSkipMask = argumentsSkipMask
argumentsSkipMask = argumentsSkipMask,
) {
private val _name: String by lazyPub {
@@ -96,7 +97,7 @@ internal class FirLightSimpleMethodForSymbol(
modifiers.add(_visibility)
if (functionSymbol.hasJvmStaticAnnotation()) {
if (!suppressStatic && functionSymbol.hasJvmStaticAnnotation()) {
modifiers.add(PsiModifier.STATIC)
}
if (functionSymbol.hasAnnotation("kotlin/jvm/Strictfp", null)) {