From 049bb4a8af77931a532eb0b5abc82efd631faaea Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 20 Jun 2018 19:16:41 +0300 Subject: [PATCH] New J2K: Don't add abstract if not class --- j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt index cea1a89cdfd..287ff39a7cf 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt @@ -66,6 +66,12 @@ class NewCodeBuilder { } override fun visitModalityModifier(modalityModifier: JKModalityModifier) { + val containingDeclaration = modalityModifier.parent?.parent + //TODO: merge with bottom one + if (modalityModifier.modality == JKModalityModifier.Modality.ABSTRACT && containingDeclaration is JKClass) { + if (containingDeclaration.classKind != JKClass.ClassKind.CLASS) return + } + printer.printWithNoIndent( when (modalityModifier.modality) { JKModalityModifier.Modality.OPEN -> "open"