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

Multiline string indent #1052

Merged
merged 10 commits into from
Oct 24, 2021
Merged

Multiline string indent #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c97c2f0
Fix multiline string indentation
Jan 9, 2021
7e800ca
Fix code which does not comply to changed indentation rules
Jan 9, 2021
9dae7c9
Rename file IndentationRuleTrimIndentTest.kt to IndentationRuleTrimIn…
Jan 9, 2021
cd6ea7c
Merge branch 'master' into multiline-string-indent
Jul 31, 2021
c90d909
Fix indentation in unit tests
Jul 31, 2021
7d8bc9b
Merge remote-tracking branch 'origin/master' into multiline-string-in…
Aug 8, 2021
c8ad190
Merge branch 'master2' into multiline-string-indent
Oct 16, 2021
9adb634
Remove changing the indentation margin of a multiline raw string lite…
Oct 16, 2021
0ae1b1f
Change message when closing quotes of multiline raw string literal ar…
Oct 16, 2021
0ea452a
Remove IndentationRuleTrimIndentTest
Oct 23, 2021
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
10 changes: 6 additions & 4 deletions ...erimental/src/test/kotlin/com/pinterest/ktlint/ruleset/experimental/AnnotationRuleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,11 +938,12 @@ class AnnotationRuleTest {

@Test
fun `lint file annotations should be separated with a blank line in script 1`() {
val code = """
val code =
"""
@file:Suppress("UnstableApiUsage")
pluginManagement {
}
""".trimIndent()
""".trimIndent()
assertThat(AnnotationRule().lint(code, script = true)).isEqualTo(
listOf(
LintError(1, 34, "annotation", AnnotationRule.fileAnnotationsShouldBeSeparated)
Expand All @@ -952,12 +953,13 @@ class AnnotationRuleTest {

@Test
fun `lint file annotations should be separated with a blank line in script 2`() {
val code = """
val code =
"""
@file:Suppress("UnstableApiUsage")

pluginManagement {
}
""".trimIndent()
""".trimIndent()
assertThat(AnnotationRule().lint(code, script = true)).isEmpty()
}

Expand Down
112 changes: 56 additions & 56 deletions ...al/src/test/kotlin/com/pinterest/ktlint/ruleset/experimental/AnnotationSpacingRuleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,12 +332,12 @@ class AnnotationSpacingRuleTest {
fun `annotations should not be separated by comments from the annotated construct`() {
val code =
"""
@Suppress("DEPRECATION") @Hello
/**
* block comment
*/
class Foo {
}
@Suppress("DEPRECATION") @Hello
/**
* block comment
*/
class Foo {
}
""".trimIndent()
assertThat(
AnnotationSpacingRule().lint(code)
Expand All @@ -352,41 +352,41 @@ class AnnotationSpacingRuleTest {
fun `annotations should be moved after comments`() {
val code =
"""
@Suppress("DEPRECATION") @Hello
/**
* block comment
*/
class Foo {
}
@Suppress("DEPRECATION") @Hello
/**
* block comment
*/
class Foo {
}
""".trimIndent()
assertThat(
AnnotationSpacingRule().format(code)
).isEqualTo(
"""
/**
* block comment
*/
@Suppress("DEPRECATION") @Hello
class Foo {
}
/**
* block comment
*/
@Suppress("DEPRECATION") @Hello
class Foo {
}
""".trimIndent()
)

val codeEOL =
"""
@Suppress("DEPRECATION") @Hello
// hello
class Foo {
}
@Suppress("DEPRECATION") @Hello
// hello
class Foo {
}
""".trimIndent()
assertThat(
AnnotationSpacingRule().format(codeEOL)
).isEqualTo(
"""
// hello
@Suppress("DEPRECATION") @Hello
class Foo {
}
// hello
@Suppress("DEPRECATION") @Hello
class Foo {
}
""".trimIndent()
)
}
Expand All @@ -395,33 +395,33 @@ class AnnotationSpacingRuleTest {
fun `preceding whitespaces are preserved`() {
val code =
"""
package a.b.c
package a.b.c

val hello = 5
val hello = 5


@Suppress("DEPRECATION") @Hello
/**
* block comment
*/
class Foo {
}
@Suppress("DEPRECATION") @Hello
/**
* block comment
*/
class Foo {
}
""".trimIndent()
assertThat(
AnnotationSpacingRule().format(code)
).isEqualTo(
"""
package a.b.c
package a.b.c

val hello = 5
val hello = 5


/**
* block comment
*/
@Suppress("DEPRECATION") @Hello
class Foo {
}
/**
* block comment
*/
@Suppress("DEPRECATION") @Hello
class Foo {
}
""".trimIndent()
)
}
Expand All @@ -443,18 +443,18 @@ class AnnotationSpacingRuleTest {
fun `format eol comment on the same line as the annotation`() {
val code =
"""
@SuppressWarnings // foo
@SuppressWarnings // foo

fun bar() {
}
fun bar() {
}
""".trimIndent()
assertThat(
AnnotationSpacingRule().format(code)
).isEqualTo(
"""
@SuppressWarnings // foo
fun bar() {
}
@SuppressWarnings // foo
fun bar() {
}
""".trimIndent()
)
}
Expand All @@ -463,19 +463,19 @@ class AnnotationSpacingRuleTest {
fun `format eol comment on the same line as the annotation 2`() {
val code =
"""
@SuppressWarnings // foo
// bar
fun bar() {
}
@SuppressWarnings // foo
// bar
fun bar() {
}
""".trimIndent()
assertThat(
AnnotationSpacingRule().format(code)
).isEqualTo(
"""
// bar
@SuppressWarnings // foo
fun bar() {
}
// bar
@SuppressWarnings // foo
fun bar() {
}
""".trimIndent()
)
}
Expand Down
58 changes: 29 additions & 29 deletions ...src/test/kotlin/com/pinterest/ktlint/ruleset/experimental/ArgumentListWrappingRuleTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ class ArgumentListWrappingRuleTest {
assertThat(
ArgumentListWrappingRule().lint(
"""
val x = f(
a,
b, c
)
val x = f(
a,
b, c
)
""".trimIndent()
)
).isEqualTo(
Expand All @@ -36,19 +36,19 @@ class ArgumentListWrappingRuleTest {
assertThat(
ArgumentListWrappingRule().format(
"""
val x = f(
a,
b, c
)
val x = f(
a,
b, c
)
""".trimIndent()
)
).isEqualTo(
"""
val x = f(
a,
b,
c
)
val x = f(
a,
b,
c
)
""".trimIndent()
)
}
Expand All @@ -58,25 +58,25 @@ class ArgumentListWrappingRuleTest {
assertThat(
ArgumentListWrappingRule().format(
"""
val x = test(
one("a", "b",
"c"),
"Two", "Three", "Four"
)
val x = test(
one("a", "b",
"c"),
"Two", "Three", "Four"
)
""".trimIndent()
)
).isEqualTo(
"""
val x = test(
one(
"a",
"b",
"c"
),
"Two",
"Three",
"Four"
)
val x = test(
one(
"a",
"b",
"c"
),
"Two",
"Three",
"Four"
)
""".trimIndent()
)
}
Expand All @@ -86,7 +86,7 @@ class ArgumentListWrappingRuleTest {
assertThat(
ArgumentListWrappingRule().lint(
"""
val x = f(a, b, c)
val x = f(a, b, c)
""".trimIndent(),
userData = mapOf("max_line_length" to "10")
)
Expand Down
Loading