From b83a529b777528df320fdaaed05e9ce0c07baf76 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 9 Jan 2020 16:43:33 +0300 Subject: [PATCH] New J2K: fix incorrectly removed line break before constructor comment That caused class body brace to be under the comment #KT-35478 fixed --- .../processings/inspeсtionLikeProcessings.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt index dfd15b6ceb8..07e3414d1b0 100644 --- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt +++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/postProcessing/processings/inspeсtionLikeProcessings.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.nj2k.postProcessing.processings import com.intellij.psi.PsiElement +import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.search.searches.ReferencesSearch import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor @@ -297,7 +298,11 @@ class RemoveRedundantConstructorKeywordProcessing : override fun apply(element: KtPrimaryConstructor) { - element.removeRedundantConstructorKeywordAndSpace() + element.getConstructorKeyword()?.delete() + element.prevSibling + ?.safeAs() + ?.takeUnless { it.textContains('\n') } + ?.delete() } }