From 00ab33bbf977eb44347a9394c812f4bc2e02d6c2 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 30 Nov 2022 21:51:06 +0100 Subject: [PATCH] [SLC] extract non-common logic from computeModalityForMethod ^KTIJ-23783 --- .../light/classes/symbol/methods/SymbolLightSimpleMethod.kt | 4 ++++ .../jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightSimpleMethod.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightSimpleMethod.kt index f8a119b601a..834897632f0 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightSimpleMethod.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightSimpleMethod.kt @@ -100,6 +100,10 @@ internal class SymbolLightSimpleMethod( result = modifiers ) + if (functionSymbol.isExternal) { + modifiers.add(PsiModifier.NATIVE) + } + modifiers.add(functionSymbol.toPsiVisibilityForMember()) if (!suppressStatic && functionSymbol.hasJvmStaticAnnotation()) { diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt index d2d50b35102..240cb305977 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt @@ -89,10 +89,6 @@ internal fun KtSymbolWithModality.computeModalityForMethod( } } - if (this is KtFunctionSymbol && isExternal) { - result.add(PsiModifier.NATIVE) - } - if (isTopLevel) { result.add(PsiModifier.STATIC) val needFinalModifier = when (this) {