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

New J2K: Fix formatting saving

Browse Source
This commit is contained in:
Ilya Kirillov
2019-03-12 12:21:12 +03:00
committed by Ilya Kirillov
parent 13a9a56e85
commit c1ed2e020c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/src/org/jetbrains/kotlin/nj2k/ConversionsRunner.kt
+2 -1
View File
@@ -39,8 +39,9 @@ object ConversionsRunner {
+AssignmentStatementSimplifyValConversion() +AssignmentStatementSimplifyValConversion()
+AssignmentStatementSimplifyAlsoConversion() +AssignmentStatementSimplifyAlsoConversion()
+AssignmentStatementSplitAlsoConversion() +AssignmentStatementSplitAlsoConversion()
+PolyadicExpressionConversion(context) +PolyadicExpressionConversion()
+OperatorExpressionConversion(context) +OperatorExpressionConversion(context)
+AddParenthesisForLineBreaksInBinaryExpression()
+ThrowStatementConversion() +ThrowStatementConversion()
+ArrayInitializerConversion(context) +ArrayInitializerConversion(context)
+TryStatementConversion(context) +TryStatementConversion(context)
nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt
+1 -1
View File
@@ -55,7 +55,7 @@ class NewCodeBuilder {
private fun List<JKNonCodeElement>.createText(): String { private fun List<JKNonCodeElement>.createText(): String {
val text = joinToString("") { token -> token.createText() } val text = joinToString("") { token -> token.createText() }
val needNewLine = text.lastIndexOf('\n') < text.lastIndexOf("//") val needNewLine = text.lastIndexOf('\n') < text.lastIndexOf("//")
return text +"\n".takeIf { needNewLine }.orEmpty() return text + "\n".takeIf { needNewLine }.orEmpty()
} }
private fun JKNonCodeElementsListOwner.needPreserveSpacesAfterLastCommit() = private fun JKNonCodeElementsListOwner.needPreserveSpacesAfterLastCommit() =