Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 'Missing newline before ")"' when no params #364

Merged
merged 2 commits into from
Apr 2, 2019
Merged

Fix 'Missing newline before ")"' when no params #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9b3dbb
Fix 'Missing newline before ")"' when no params
jlmd Mar 30, 2019
c24eb5a
Revert commit b6f9ad5
jlmd Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...rd/src/main/kotlin/com/github/shyiko/ktlint/ruleset/standard/ParameterListWrappingRule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.github.shyiko.ktlint.core.ast.ElementType.VALUE_PARAMETER_LIST
import com.github.shyiko.ktlint.core.ast.ElementType.WHITE_SPACE
import com.github.shyiko.ktlint.core.ast.children
import com.github.shyiko.ktlint.core.ast.isRoot
import com.github.shyiko.ktlint.core.ast.prevCodeLeaf
import com.github.shyiko.ktlint.core.ast.prevLeaf
import com.github.shyiko.ktlint.core.ast.visit
import org.jetbrains.kotlin.com.intellij.lang.ASTNode
Expand Down Expand Up @@ -39,6 +38,8 @@ class ParameterListWrappingRule : Rule("parameter-list-wrapping") {
return
}
if (node.elementType == VALUE_PARAMETER_LIST &&
// skip when there are no parameters
node.firstChildNode?.treeNext?.elementType != RPAR &&
// skip lambda parameters
node.treeParent?.elementType != FUNCTION_LITERAL
) {
Expand Down Expand Up @@ -99,7 +100,7 @@ class ParameterListWrappingRule : Rule("parameter-list-wrapping") {
paramInnerIndentAdjustment = adjustedIndent.length - prevLeaf.getTextLength()
(prevLeaf as LeafPsiElement).rawReplaceWithText(adjustedIndent)
}
} else if (prevLeaf?.prevCodeLeaf()?.elementType != LPAR) {
} else {
emit(child.startOffset, errorMessage(child), true)
if (autoCorrect) {
paramInnerIndentAdjustment = intendedIndent.length - child.column
Expand Down
16 changes: 14 additions & 2 deletions ...rc/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/ParameterListWrappingRuleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,20 @@ class ParameterListWrappingRuleTest {
)
}

@Test
fun testLintClassParameterListWhenMaxLineLengthExceededAndNoParameters() {
assertThat(
ParameterListWrappingRule().lint(
"""
class ClassAWithALongName()
""".trimIndent(),
userData = mapOf("max_line_length" to "10")
)
).doesNotContain(
LintError(1, 27, "parameter-list-wrapping", """Missing newline before ")"""")
)
}

@Test
fun testLintClassParameterListValid() {
assertThat(
Expand Down Expand Up @@ -137,8 +151,6 @@ class ParameterListWrappingRuleTest {
b: Any,
c: Any) {
}
fun f() {}
fun f(/**/) {}
""".trimIndent()
)
).isEqualTo(
Expand Down