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

Insert space around the multiplication operator #598

Merged
merged 1 commit into from
Oct 3, 2019
Merged

Insert space around the multiplication operator #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...ndard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/SpacingAroundOperatorsRule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import com.pinterest.ktlint.core.ast.ElementType.PERCEQ
import com.pinterest.ktlint.core.ast.ElementType.PLUS
import com.pinterest.ktlint.core.ast.ElementType.PLUSEQ
import com.pinterest.ktlint.core.ast.ElementType.TYPE_PARAMETER_LIST
import com.pinterest.ktlint.core.ast.ElementType.VALUE_ARGUMENT
import com.pinterest.ktlint.core.ast.ElementType.WHITE_SPACE
import com.pinterest.ktlint.core.ast.isPartOf
import com.pinterest.ktlint.core.ast.nextLeaf
Expand All @@ -41,7 +42,6 @@ import org.jetbrains.kotlin.psi.KtImportDirective
import org.jetbrains.kotlin.psi.KtPrefixExpression
import org.jetbrains.kotlin.psi.KtSuperExpression
import org.jetbrains.kotlin.psi.KtTypeArgumentList
import org.jetbrains.kotlin.psi.KtValueArgument

class SpacingAroundOperatorsRule : Rule("op-spacing") {

Expand All @@ -59,7 +59,7 @@ class SpacingAroundOperatorsRule : Rule("op-spacing") {
node is LeafElement &&
!node.isPartOf(KtPrefixExpression::class) && // not unary
!node.isPartOf(KtTypeArgumentList::class) && // C<T>
!(node.elementType == MUL && node.isPartOf(KtValueArgument::class)) && // fn(*array)
!(node.elementType == MUL && node.treeParent.elementType == VALUE_ARGUMENT) && // fn(*array)
!node.isPartOf(KtImportDirective::class) && // import *
!node.isPartOf(KtSuperExpression::class) // super<T>
) {
Expand Down
14 changes: 13 additions & 1 deletion ktlint-ruleset-standard/src/test/resources/spec/op-spacing/lint.kt.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ fun main() {
val v1 = 0-1*2
val v2 = -0 - 1
val v3 = v * 2
fn(1 + 1 - 1 * 1 / 1)
fn(1+1-1*1/1)
fn(v1+1*v2)
run { v1*2 }
i++
val y = +1
var x = 1 in 3..4
Expand All @@ -14,6 +18,7 @@ fun main() {
val a= ""
d *= 1
call(*v)
call(1, *v, 2)
open class A<T> {
open fun x() {}
}
Expand All @@ -25,4 +30,11 @@ fun main() {
// expect
// 4:15:Missing spacing around "-"
// 4:17:Missing spacing around "*"
// 14:10:Missing spacing before "="
// 8:9:Missing spacing around "+"
// 8:11:Missing spacing around "-"
// 8:13:Missing spacing around "*"
// 8:15:Missing spacing around "/"
// 9:10:Missing spacing around "+"
// 9:12:Missing spacing around "*"
// 10:13:Missing spacing around "*"
// 18:10:Missing spacing before "="