diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt index db80b4ca7c3..a23e398b116 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt @@ -78,6 +78,7 @@ object ConversionsRunner { +StaticsToCompanionExtractConversion() +InterfaceWithFieldConversion() +ClassToObjectPromotionConversion(context) + +RemoveWrongExtraModifiersForSingleFunctionsConversion() +MethodReferenceToLambdaConversion(context) +BuiltinMembersConversion(context) +ImplicitCastsConversion(context) diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/RemoveWrongExtraModifiersForSingleFunctionsConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/RemoveWrongExtraModifiersForSingleFunctionsConversion.kt new file mode 100644 index 00000000000..2e7900182e1 --- /dev/null +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/RemoveWrongExtraModifiersForSingleFunctionsConversion.kt @@ -0,0 +1,20 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.nj2k.conversions + +import org.jetbrains.kotlin.nj2k.tree.* + +class RemoveWrongExtraModifiersForSingleFunctionsConversion : RecursiveApplicableConversionBase() { + override fun applyToElement(element: JKTreeElement): JKTreeElement { + if (element !is JKExtraModifiersOwner) return recurse(element) + if (element.parentOfType() == null) { + element.elementByModifier(ExtraModifier.STATIC)?.also { modifierElement -> + element.extraModifierElements -= modifierElement + } + } + return recurse(element) + } +}