kotlinSpacingRules: fix cases with EOL comments and comma

#KT-34744
This commit is contained in:
Dmitry Gridin
2020-01-15 17:52:50 +07:00
parent 8142ad3f4d
commit d98794479d
2 changed files with 17 additions and 6 deletions
@@ -233,6 +233,13 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
createSpacing(0)
}
}
inPosition(left = VALUE_PARAMETER, right = COMMA).customRule { _, left, _ ->
if (left.node?.lastChildNode?.elementType === EOL_COMMENT)
createSpacing(0, minLineFeeds = 1)
else
null
}
}
simple {
@@ -275,6 +282,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
after(DOC_COMMENT).lineBreakInCode()
// =============== Spacing ================
between(EOL_COMMENT, COMMA).lineBreakInCode()
before(COMMA).spacesNoLineBreak(if (kotlinCommonSettings.SPACE_BEFORE_COMMA) 1 else 0)
after(COMMA).spaceIf(kotlinCommonSettings.SPACE_AFTER_COMMA)
@@ -1,6 +1,9 @@
internal class C(private val p1: Int /* parameter p1 */ // field p1
,
/**
* Field myP2
*/
private val myP2: Int, /* Field p3 */ var p3: Int)
internal class C(
private val p1: Int /* parameter p1 */ // field p1
,
/**
* Field myP2
*/
private val myP2: Int, /* Field p3 */
var p3: Int
)