Fixed #327 - 'Missing newline before ")"'

Stanley Shyiko · Stanley Shyiko · commit b6f9ad503663 · 2019-02-03T22:40:28.000-08:00
diff --git a/ktlint-ruleset-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/ParameterListWrappingRule.kt b/ktlint-ruleset-standard/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/ParameterListWrappingRule.kt
@@ -88,7 +88,7 @@ class ParameterListWrappingRule : Rule("parameter-list-wrapping") {
                                     paramInnerIndentAdjustment = adjustedIndent.length - prevLeaf.textLength
                                     (prevLeaf as LeafPsiElement).rawReplaceWithText(adjustedIndent)
                                 }
-                            } else {
+                            } else if (prevLeaf?.prevLeafIgnoringWhitespaceAndComments()?.node?.elementType != KtTokens.LPAR) {
                                 emit(child.startOffset, errorMessage(child), true)
                                 if (autoCorrect) {
                                     paramInnerIndentAdjustment = intendedIndent.length - child.psi.column
diff --git a/ktlint-ruleset-standard/src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/ParameterListWrappingRuleTest.kt b/ktlint-ruleset-standard/src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/ParameterListWrappingRuleTest.kt
@@ -137,6 +137,8 @@ class ParameterListWrappingRuleTest {
                   b: Any,
                   c: Any) {
             }
+            fun f() {}
+            fun f(/**/) {}
             """.trimIndent()
             )).isEqualTo(
             listOf(

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ class ParameterListWrappingRule : Rule("parameter-list-wrapping") {`
`88`	`88`	`paramInnerIndentAdjustment = adjustedIndent.length - prevLeaf.textLength`
`89`	`89`	`(prevLeaf as LeafPsiElement).rawReplaceWithText(adjustedIndent)`
`90`	`90`	`}`
`91`		`- } else {`
	`91`	`+ } else if (prevLeaf?.prevLeafIgnoringWhitespaceAndComments()?.node?.elementType != KtTokens.LPAR) {`
`92`	`92`	`emit(child.startOffset, errorMessage(child), true)`
`93`	`93`	`if (autoCorrect) {`
`94`	`94`	`paramInnerIndentAdjustment = intendedIndent.length - child.psi.column`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,8 @@ class ParameterListWrappingRuleTest {`
`137`	`137`	`b: Any,`
`138`	`138`	`c: Any) {`
`139`	`139`	`}`
	`140`	`+ fun f() {}`
	`141`	`+ fun f(/**/) {}`
`140`	`142`	`""".trimIndent()`
`141`	`143`	`)).isEqualTo(`
`142`	`144`	`listOf(`