diff --git a/build.gradle.kts b/build.gradle.kts index 7e950f1fb5..86b559bfb7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -65,16 +65,13 @@ subprojects { } } } - configure { - sonatypeHost = S01 - } } apply(plugin = "com.diffplug.spotless") configure { kotlin { target("**/*.kt") - ktlint(libs.versions.ktlint.get()).userData(mapOf("indent_size" to "2")) + ktlint(libs.versions.ktlint.get()).editorConfigOverride(mapOf("indent_size" to "2")) trimTrailingWhitespace() endWithNewline() diff --git a/gradle.properties b/gradle.properties index ac7c8d96ea..bf5bf659f8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,3 +14,6 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=square POM_DEVELOPER_NAME=Square, Inc. + +SONATYPE_HOST=S01 +RELEASE_SIGNING_ENABLED=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 891232afa7..a9ab1a23be 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,29 +13,31 @@ # limitations under the License. [versions] -kotlin = "1.6.21" -kct = "1.4.8" -ksp = "1.6.20-1.0.5" -ktlint = "0.42.1" +kotlin = "1.7.0" +kct = "1.4.9-alpha01" +ksp = "1.7.0-1.0.6" +ktlint = "0.45.2" [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -dokka = { id = "org.jetbrains.dokka", version = "1.6.20" } +dokka = { id = "org.jetbrains.dokka", version = "1.6.21" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -spotless = { id = "com.diffplug.spotless", version = "6.2.1" } -mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.18.0" } +spotless = { id = "com.diffplug.spotless", version = "6.7.1" } +mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.20.0" } [libraries] autoCommon = { module = "com.google.auto:auto-common", version = "1.1.2" } -guava = { module = "com.google.guava:guava", version = "30.1.1-jre" } +guava = { module = "com.google.guava:guava", version = "31.1-jre" } javapoet = "com.squareup:javapoet:1.13.0" autoService = "com.google.auto.service:auto-service-annotations:1.0" autoService-ksp = "dev.zacsweers.autoservice:auto-service-ksp:1.0.0" +kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" } +kotlin-annotationProcessingEmbeddable = { module = "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable", version.ref = "kotlin" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } kotlin-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } -kotlin-metadata = { module = "org.jetbrains.kotlinx:kotlinx-metadata-jvm", version = "0.4.0" } +kotlin-metadata = { module = "org.jetbrains.kotlinx:kotlinx-metadata-jvm", version = "0.4.2" } ksp = { module = "com.google.devtools.ksp:symbol-processing", version.ref = "ksp" } ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" } diff --git a/interop/kotlinx-metadata/build.gradle.kts b/interop/kotlinx-metadata/build.gradle.kts index 5bc0667795..df75e1ad1b 100644 --- a/interop/kotlinx-metadata/build.gradle.kts +++ b/interop/kotlinx-metadata/build.gradle.kts @@ -39,4 +39,6 @@ dependencies { testImplementation(libs.truth) testImplementation(libs.compileTesting) testImplementation(libs.kotlinCompileTesting) + testImplementation(libs.kotlin.annotationProcessingEmbeddable) + testImplementation(libs.kotlin.compilerEmbeddable) } diff --git a/interop/ksp/test-processor/build.gradle.kts b/interop/ksp/test-processor/build.gradle.kts index 5d2e2fb54f..b54e8ff741 100644 --- a/interop/ksp/test-processor/build.gradle.kts +++ b/interop/ksp/test-processor/build.gradle.kts @@ -31,7 +31,10 @@ dependencies { implementation(libs.autoService) compileOnly(libs.ksp.api) ksp(libs.autoService.ksp) - // Always force the latest version of the KSP impl in tests to match what we're building against + // Always force the latest version of the KSP/kotlin impl in tests to match what we're building against + testImplementation(libs.ksp.api) + testImplementation(libs.kotlin.compilerEmbeddable) + testImplementation(libs.kotlin.annotationProcessingEmbeddable) testImplementation(libs.ksp) testImplementation(libs.kotlinCompileTesting) testImplementation(libs.kotlinCompileTesting.ksp) diff --git a/kotlinpoet/build.gradle.kts b/kotlinpoet/build.gradle.kts index 94f8445e94..830f870ff1 100644 --- a/kotlinpoet/build.gradle.kts +++ b/kotlinpoet/build.gradle.kts @@ -47,4 +47,6 @@ dependencies { testImplementation(libs.jimfs) testImplementation(libs.ecj) testImplementation(libs.kotlinCompileTesting) + testImplementation(libs.kotlin.annotationProcessingEmbeddable) + testImplementation(libs.kotlin.compilerEmbeddable) } diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeWriter.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeWriter.kt index 50ec25230a..a2755b148f 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeWriter.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeWriter.kt @@ -320,7 +320,8 @@ internal class CodeWriter constructor( |Current code block: |- Format parts: ${codeBlock.formatParts.map(::escapeCharacterLiterals)} |- Arguments: ${codeBlock.args} - |""".trimMargin() + | + """.trimMargin() } statementLine = 0 } @@ -333,7 +334,8 @@ internal class CodeWriter constructor( |Current code block: |- Format parts: ${codeBlock.formatParts.map(::escapeCharacterLiterals)} |- Arguments: ${codeBlock.args} - |""".trimMargin() + | + """.trimMargin() } if (statementLine > 0) { unindent(2) // End a multi-line statement. Decrease the indentation level. diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotationSpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotationSpecTest.kt index 366e258cbc..73143e19e2 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotationSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotationSpecTest.kt @@ -117,7 +117,8 @@ class AnnotationSpecTest { | r = arrayOf(Float::class, Double::class), |) |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -147,7 +148,8 @@ class AnnotationSpecTest { | r = arrayOf(Float::class, Double::class), |) |public class IsAnnotated - |""".trimMargin() + | + """.trimMargin() ) } @@ -193,7 +195,8 @@ class AnnotationSpecTest { | r = arrayOf(Float::class, Double::class), |) |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -231,7 +234,8 @@ class AnnotationSpecTest { | r = arrayOf(Float::class, Double::class), |) |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -319,7 +323,7 @@ class AnnotationSpecTest { | @Suppress("Things") | val annotatedString = "AnnotatedString" |} - """.trimMargin() + """.trimMargin() ) } @@ -362,7 +366,8 @@ class AnnotationSpecTest { |@JavaClassWithArrayValueAnnotation.AnnotationWithArrayValue(value = arrayOf(Object::class, | Boolean::class)) |public class Result - |""".trimMargin() + | + """.trimMargin() ) } @@ -390,7 +395,7 @@ class AnnotationSpecTest { | |@AnnotationSpecTest.AnnotationWithArrayValue(value = arrayOf(Object::class, Boolean::class)) |public class Result - """.trimMargin() + """.trimMargin() ) } @@ -412,7 +417,7 @@ class AnnotationSpecTest { |@JavaClassWithArrayValueAnnotation.AnnotationWithArrayValue(value = arrayOf(Object::class, | Boolean::class)) |public class Result - """.trimMargin() + """.trimMargin() ) } @@ -432,7 +437,7 @@ class AnnotationSpecTest { | |@AnnotationSpecTest.AnnotationWithArrayValue(value = arrayOf(Object::class, Boolean::class)) |public class Result - """.trimMargin() + """.trimMargin() ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CodeBlockTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CodeBlockTest.kt index 8a8b1e94e0..a3c702659f 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CodeBlockTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CodeBlockTest.kt @@ -201,7 +201,8 @@ class CodeBlockTest { |Current code block: |- Format parts: [«, print(, «, %L, », ), \n, »] |- Arguments: [1 + 1] - |""".trimMargin() + | + """.trimMargin() ) } @@ -219,7 +220,8 @@ class CodeBlockTest { |Current code block: |- Format parts: [«, print(, %L, », ), \n, »] |- Arguments: [1 + 1] - |""".trimMargin() + | + """.trimMargin() ) } @@ -460,7 +462,8 @@ class CodeBlockTest { |list.forEach { element -> | println(element) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -475,7 +478,8 @@ class CodeBlockTest { |listOf("${'$'}{1.toString()}").forEach { element -> | println(element) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -494,7 +498,8 @@ class CodeBlockTest { |} else { | println("bar") |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -521,7 +526,8 @@ class CodeBlockTest { | "Long string that would wrap the line 2 ") { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -537,7 +543,8 @@ class CodeBlockTest { |Modeling a kdoc | |Statement with no args - |""".trimMargin() + | + """.trimMargin() ) } @@ -585,7 +592,8 @@ class CodeBlockTest { | "London", | ) |) - |""".trimMargin() + | + """.trimMargin() ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CrossplatformTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CrossplatformTest.kt index 46a736fd31..63ed06b197 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CrossplatformTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CrossplatformTest.kt @@ -89,7 +89,8 @@ class CrossplatformTest { |} | |public actual typealias AtomicRef = AtomicReference - |""".trimMargin() + | + """.trimMargin() ) } @@ -118,7 +119,8 @@ class CrossplatformTest { | | public constructor(message: String) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -139,7 +141,8 @@ class CrossplatformTest { |public expect val bar: String | |public actual val bar: String = "Hello" - |""".trimMargin() + | + """.trimMargin() ) } @@ -166,7 +169,8 @@ class CrossplatformTest { |public expect fun f1(): Int | |public actual fun f1() = 1 - |""".trimMargin() + | + """.trimMargin() ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/DelegatedConstructorCallTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/DelegatedConstructorCallTest.kt index 5398f1867e..7b85e8ffad 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/DelegatedConstructorCallTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/DelegatedConstructorCallTest.kt @@ -26,7 +26,8 @@ class DelegatedConstructorCallTest { assertThat(builder.build().toString()).isEqualTo( """ |public class Test : testpackage.TestSuper() - |""".trimMargin() + | + """.trimMargin() ) } @@ -37,7 +38,8 @@ class DelegatedConstructorCallTest { assertThat(builder.build().toString()).isEqualTo( """ |public object Test : testpackage.TestSuper() - |""".trimMargin() + | + """.trimMargin() ) } @@ -49,7 +51,8 @@ class DelegatedConstructorCallTest { assertThat(builder.build().toString()).isEqualTo( """ |public external class Test : testpackage.TestSuper - |""".trimMargin() + | + """.trimMargin() ) } @@ -61,7 +64,8 @@ class DelegatedConstructorCallTest { assertThat(builder.build().toString()).isEqualTo( """ |public expect class Test : testpackage.TestSuper - |""".trimMargin() + | + """.trimMargin() ) } @@ -73,7 +77,8 @@ class DelegatedConstructorCallTest { assertThat(builder.build().toString()).isEqualTo( """ |public expect object Test : testpackage.TestSuper - |""".trimMargin() + | + """.trimMargin() ) } @@ -85,7 +90,8 @@ class DelegatedConstructorCallTest { assertThat(builder.build().toString()).isEqualTo( """ |public external object Test : testpackage.TestSuper - |""".trimMargin() + | + """.trimMargin() ) } @@ -97,7 +103,8 @@ class DelegatedConstructorCallTest { assertThat(builder.build().toString()).isEqualTo( """ |public class Test : testpackage.TestSuper(anything) - |""".trimMargin() + | + """.trimMargin() ) } @@ -109,7 +116,8 @@ class DelegatedConstructorCallTest { assertThat(builder.build().toString()).isEqualTo( """ |public object Test : testpackage.TestSuper(anything) - |""".trimMargin() + | + """.trimMargin() ) } @@ -128,7 +136,8 @@ class DelegatedConstructorCallTest { |public class Test() { | public constructor(foo: kotlin.String) : this() |} - |""".trimMargin() + | + """.trimMargin() ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExpectDeclarationsTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExpectDeclarationsTest.kt index 38973ef707..b90075198f 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExpectDeclarationsTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExpectDeclarationsTest.kt @@ -27,7 +27,8 @@ class ExpectDeclarationsTest { assertThat(methodSpec.toString()).isEqualTo( """ |public expect fun function(): kotlin.Unit - |""".trimMargin() + | + """.trimMargin() ) } @@ -43,7 +44,8 @@ class ExpectDeclarationsTest { |public expect class Test { | public fun function(): kotlin.Unit |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -55,7 +57,8 @@ class ExpectDeclarationsTest { assertThat(propertySpec.toString()).isEqualTo( """ |expect val prop: kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -71,7 +74,8 @@ class ExpectDeclarationsTest { |public expect class Test { | public val prop: kotlin.String |} - |""".trimMargin() + | + """.trimMargin() ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExternalDeclarationsTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExternalDeclarationsTest.kt index a227410d00..b00def65cb 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExternalDeclarationsTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExternalDeclarationsTest.kt @@ -27,7 +27,8 @@ class ExternalDeclarationsTest { assertThat(methodSpec.toString()).isEqualTo( """ |public external fun function(): kotlin.Unit - |""".trimMargin() + | + """.trimMargin() ) } @@ -40,7 +41,8 @@ class ExternalDeclarationsTest { assertThat(methodSpec.toString()).isEqualTo( """ |public external fun function() = kotlin.js.definedExternally - |""".trimMargin() + | + """.trimMargin() ) } @@ -55,7 +57,8 @@ class ExternalDeclarationsTest { |public external fun function(): kotlin.Unit { | kotlin.js.definedExternally |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -71,7 +74,8 @@ class ExternalDeclarationsTest { |public external class Test { | public fun function(): kotlin.Unit |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -88,7 +92,8 @@ class ExternalDeclarationsTest { |public external class Test { | public fun function() = kotlin.js.definedExternally |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -108,7 +113,8 @@ class ExternalDeclarationsTest { | kotlin.js.definedExternally | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -120,7 +126,8 @@ class ExternalDeclarationsTest { assertThat(propertySpec.toString()).isEqualTo( """ |external val prop: kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -133,7 +140,8 @@ class ExternalDeclarationsTest { assertThat(propertySpec.toString()).isEqualTo( """ |external val prop: kotlin.String = kotlin.js.definedExternally - |""".trimMargin() + | + """.trimMargin() ) } @@ -149,7 +157,8 @@ class ExternalDeclarationsTest { |public external class Test { | public val prop: kotlin.String |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -166,7 +175,8 @@ class ExternalDeclarationsTest { |public external class Test { | public val prop: kotlin.String = kotlin.js.definedExternally |} - |""".trimMargin() + | + """.trimMargin() ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileSpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileSpecTest.kt index dce465df08..fa765823f1 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileSpecTest.kt @@ -75,7 +75,8 @@ class FileSpecTest { | return if (result.isEmpty()) emptyList() else result | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -121,7 +122,8 @@ class FileSpecTest { | | public constructor(vararg states: Thread.State) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -147,7 +149,8 @@ class FileSpecTest { |import kotlin.collections.List | |public fun prepareTacos(): List = wrap(INGREDIENTS) - |""".trimMargin() + | + """.trimMargin() ) } @@ -177,7 +180,8 @@ class FileSpecTest { | out.println("hello"); | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -199,7 +203,8 @@ class FileSpecTest { | return TimeUnit.SECONDS.convert(minutes, TimeUnit.MINUTES) | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -222,7 +227,8 @@ class FileSpecTest { | return SECONDS.convert(minutes, TimeUnit.MINUTES) | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -247,7 +253,8 @@ class FileSpecTest { | return SECONDS.convert(minutes, MINUTES) | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -279,7 +286,8 @@ class FileSpecTest { |package com.squareup.tacos | |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -300,7 +308,8 @@ class FileSpecTest { |public class Taco { | public val madeFreshDate: Date |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -321,7 +330,8 @@ class FileSpecTest { |public class Taco { | public val madeFreshDate: Date |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -332,7 +342,8 @@ class FileSpecTest { """ |package com.squareup.`taco factory` | - |""".trimMargin() + | + """.trimMargin() ) } @@ -356,7 +367,8 @@ class FileSpecTest { | | public val madeFreshDatabaseDate: java.sql.Date |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -380,7 +392,8 @@ class FileSpecTest { | | public val madeFreshDate2: com.squareup.`do`.`val`.`var`.Date |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -403,7 +416,8 @@ class FileSpecTest { |public fun main(): Unit { | println(TacoFactory.produceTacos()) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -427,7 +441,8 @@ class FileSpecTest { |public fun main(): Unit { | println(`La Taqueria`.produceTacos()) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -456,7 +471,8 @@ class FileSpecTest { |public val a: JString = JString("a") | |public val b: KString = "b" - |""".trimMargin() + | + """.trimMargin() ) } @@ -480,7 +496,8 @@ class FileSpecTest { |public fun sleepForFiveMins(): Unit { | MINS.sleep(5) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -526,7 +543,8 @@ class FileSpecTest { | public class D | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -572,7 +590,8 @@ class FileSpecTest { | public class D | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -624,7 +643,8 @@ class FileSpecTest { | public class D | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -650,7 +670,8 @@ class FileSpecTest { |public class Taco : Message() { | public class Builder : Message.Builder() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -679,7 +700,8 @@ class FileSpecTest { | @Component.Builder | public class Builder |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -709,7 +731,8 @@ class FileSpecTest { | System.out.println("Hello World!"); | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -728,7 +751,8 @@ class FileSpecTest { |import Test | |public class World : Test - |""".trimMargin() + | + """.trimMargin() ) } @@ -743,7 +767,8 @@ class FileSpecTest { |package com.squareup.tacos | |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -762,7 +787,8 @@ class FileSpecTest { |package com.squareup.tacos | |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -784,7 +810,8 @@ class FileSpecTest { | | public class A |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -800,7 +827,8 @@ class FileSpecTest { |public class A | |public class B - |""".trimMargin() + | + """.trimMargin() ) } @@ -826,7 +854,8 @@ class FileSpecTest { |public typealias Int8 = Byte | |public typealias FileTable = Map - |""".trimMargin() + | + """.trimMargin() ) } @@ -850,7 +879,8 @@ class FileSpecTest { |import kotlin.jvm.JvmMultifileClass |import kotlin.jvm.JvmName | - |""".trimMargin() + | + """.trimMargin() ) } @@ -872,7 +902,8 @@ class FileSpecTest { """ |package com.squareup.`is`.`fun`.`in` | - |""".trimMargin() + | + """.trimMargin() ) } @@ -974,7 +1005,8 @@ class FileSpecTest { """ |val inputBigInt = bigInt(input) |return inputBigInt.add(5) - |""".trimMargin() + | + """.trimMargin() ) .build() ) @@ -991,7 +1023,8 @@ class FileSpecTest { | val inputBigInt = bigInt(input) | return inputBigInt.add(5) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1010,7 +1043,8 @@ class FileSpecTest { | |public fun foo(): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1024,7 +1058,8 @@ class FileSpecTest { | |import a.really.veryveryveryveryveryveryvery.long.pkgname.that.will.definitely.cause.a.wrap.duetoitslength.MyClass | - |""".trimMargin() + | + """.trimMargin() ) } @@ -1038,7 +1073,8 @@ class FileSpecTest { | |import a.really.veryveryveryveryveryveryvery.long.pkgname.that.will.definitely.cause.a.wrap.duetoitslength.MyClass as MyClassAlias | - |""".trimMargin() + | + """.trimMargin() ) } @@ -1054,7 +1090,8 @@ class FileSpecTest { |// Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. |package com.squareup.tacos | - |""".trimMargin() + | + """.trimMargin() ) } @@ -1096,7 +1133,8 @@ class FileSpecTest { |public fun f2(): Unit { | // this is a very very very very very very very very very very long line with a very long lambda type: suspend String.(foo: List>>>) -> String |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1130,7 +1168,8 @@ class FileSpecTest { |public class Yay | |val yayInstance = Yay() - |""".trimMargin() + | + """.trimMargin() ) } @@ -1153,7 +1192,8 @@ class FileSpecTest { |val prop2: Map? = null |val prop3: @FunctionalInterface Callable? = null |val prop4: @FunctionalInterface Function? = null - |""".trimMargin() + | + """.trimMargin() ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileWritingTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileWritingTest.kt index 0213e8696a..6aef67f9d7 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileWritingTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileWritingTest.kt @@ -267,7 +267,8 @@ class FileWritingTest { |${"\t\t"}System.out.println("Hello World!"); |${"\t"}} |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -289,7 +290,8 @@ class FileWritingTest { |package foo | |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FunSpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FunSpecTest.kt index a3fe63863e..51609f00ac 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FunSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FunSpecTest.kt @@ -96,7 +96,8 @@ class FunSpecTest { |@kotlin.jvm.Throws(java.io.IOException::class, java.lang.SecurityException::class) |protected override fun everything(arg0: java.lang.String, arg1: java.util.List): java.lang.Runnable where T : java.lang.Runnable, T : java.io.Closeable { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -108,7 +109,8 @@ class FunSpecTest { """ |public override fun toString(): java.lang.String { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -123,7 +125,8 @@ class FunSpecTest { |@kotlin.jvm.Throws(java.lang.Exception::class) |public override fun call(): java.lang.Integer { |} - |""".trimMargin() + | + """.trimMargin() ) exec = findFirst(methods, "compareTo") funSpec = FunSpec.overriding(exec, classType, types).build() @@ -131,7 +134,8 @@ class FunSpecTest { """ |public override fun compareTo(arg0: java.lang.Long): kotlin.Int { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -164,7 +168,8 @@ class FunSpecTest { """ |public fun foo(string: kotlin.String?): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -176,7 +181,8 @@ class FunSpecTest { """ |public fun foo(): kotlin.String? { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -189,7 +195,8 @@ class FunSpecTest { """ |public fun foo(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -202,7 +209,8 @@ class FunSpecTest { assertThat(funSpec.toString()).isEqualTo( """ |public fun foo(): kotlin.Unit = bar() - |""".trimMargin() + | + """.trimMargin() ) } @@ -229,7 +237,8 @@ class FunSpecTest { | val placeholder = 1 | return "Loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong" |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -263,7 +272,8 @@ class FunSpecTest { | nodoc: kotlin.Boolean, |): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -285,7 +295,8 @@ class FunSpecTest { | */ |public fun foo(string: kotlin.String): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -317,7 +328,8 @@ class FunSpecTest { | * @return the foo. | */ |public fun foo(string: kotlin.String, nodoc: kotlin.Boolean): kotlin.String = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -336,7 +348,8 @@ class FunSpecTest { | * @return the modified foo. | */ |public fun foo(nodoc: kotlin.Boolean): kotlin.String = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -348,7 +361,8 @@ class FunSpecTest { assertThat(funSpec.toString()).isEqualTo( """ |public fun foo(): kotlin.Nothing = throw java.lang.AssertionError() - |""".trimMargin() + | + """.trimMargin() ) } @@ -365,7 +379,8 @@ class FunSpecTest { |public fun foo(): kotlin.Unit { | throwOrDoSomethingElse() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -377,7 +392,8 @@ class FunSpecTest { assertThat(funSpec.toString()).isEqualTo( """ |public fun foo() = 1 - |""".trimMargin() + | + """.trimMargin() ) } @@ -390,7 +406,8 @@ class FunSpecTest { assertThat(funSpec.toString()).isEqualTo( """ |public fun foo(): kotlin.Nothing = throw java.lang.AssertionError() - |""".trimMargin() + | + """.trimMargin() ) } @@ -409,7 +426,8 @@ class FunSpecTest { | * @return the foo. | */ |public fun foo(nodoc: kotlin.Boolean): kotlin.String = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -424,7 +442,8 @@ class FunSpecTest { """ |public fun foo(f: () -> kotlin.Unit): kotlin.String { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -441,7 +460,8 @@ class FunSpecTest { | */ |public fun foo(f: () -> kotlin.Unit): kotlin.String { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -457,7 +477,8 @@ class FunSpecTest { """ |public fun foo(f: kotlin.Int.() -> kotlin.Unit): kotlin.String { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -472,7 +493,8 @@ class FunSpecTest { |context(kotlin.String) |public fun foo(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -489,7 +511,8 @@ class FunSpecTest { |context(kotlin.String, kotlin.Int, kotlin.Boolean) |public fun foo(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -505,7 +528,8 @@ class FunSpecTest { |context(T) |public fun foo(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -521,7 +545,8 @@ class FunSpecTest { |@com.squareup.kotlinpoet.FunSpecTest.TestAnnotation |public fun foo(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -536,7 +561,8 @@ class FunSpecTest { |context(@com.squareup.kotlinpoet.FunSpecTest.TestAnnotation kotlin.String) |public fun foo(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -580,7 +606,8 @@ class FunSpecTest { """ |public fun foo(f: (kotlin.Boolean) -> kotlin.Unit): kotlin.String { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -598,7 +625,8 @@ class FunSpecTest { """ |public fun foo(f: (kotlin.Boolean, kotlin.String) -> kotlin.Unit): kotlin.String { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -618,7 +646,8 @@ class FunSpecTest { """ |public fun foo(f: ((kotlin.Boolean, kotlin.String) -> kotlin.Unit)?): kotlin.String { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -638,7 +667,8 @@ class FunSpecTest { """ |public fun foo(f: ((kotlin.Boolean, kotlin.String?) -> kotlin.Unit)?): kotlin.String { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -651,7 +681,8 @@ class FunSpecTest { assertThat(funSpec.toString()).isEqualTo( """ |public constructor(list: kotlin.collections.List) : this(list[0], list[1]) - |""".trimMargin() + | + """.trimMargin() ) } @@ -664,7 +695,8 @@ class FunSpecTest { assertThat(funSpec.toString()).isEqualTo( """ |public constructor(list: kotlin.collections.List) : super(list[0], list[1]) - |""".trimMargin() + | + """.trimMargin() ) } @@ -677,7 +709,8 @@ class FunSpecTest { assertThat(funSpec.toString()).isEqualTo( """ |public constructor(a: kotlin.Int) : this() - |""".trimMargin() + | + """.trimMargin() ) } @@ -693,7 +726,8 @@ class FunSpecTest { |public constructor(a: kotlin.Int) : this(a) { | println() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -712,7 +746,8 @@ class FunSpecTest { assertThat(constructorSpec.toString()).isEqualTo( """ |public constructor(a: kotlin.Int) - |""".trimMargin() + | + """.trimMargin() ) } @@ -749,7 +784,8 @@ class FunSpecTest { """ |public fun `if`(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -761,7 +797,8 @@ class FunSpecTest { """ |public fun `with-hyphen`(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -806,7 +843,8 @@ class FunSpecTest { | * @receiver the string to transform. | */ |public fun kotlin.String.toBar(): kotlin.String = "bar" - |""".trimMargin() + | + """.trimMargin() ) } @@ -826,7 +864,8 @@ class FunSpecTest { | * @receiver the string to transform. | */ |public fun kotlin.String.toBar(): kotlin.String = "bar" - |""".trimMargin() + | + """.trimMargin() ) } @@ -853,7 +892,8 @@ class FunSpecTest { | * @return The char at the given [position]. | */ |public fun kotlin.String.charAt(position: kotlin.Int): kotlin.Char = -1 - |""".trimMargin() + | + """.trimMargin() ) } @@ -878,7 +918,8 @@ class FunSpecTest { assertThat(updatedFunSpec.toString()).isEqualTo( """ |public constructor(values: kotlin.collections.List) : super(values.toImmutableList()) - |""".trimMargin() + | + """.trimMargin() ) } @@ -940,7 +981,8 @@ class FunSpecTest { |@kotlin.jvm.JvmStatic |internal fun staticMethod(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -952,7 +994,8 @@ class FunSpecTest { """ |internal final fun finalMethod(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -965,7 +1008,8 @@ class FunSpecTest { |@kotlin.jvm.Synchronized |internal fun synchronizedMethod(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -979,7 +1023,8 @@ class FunSpecTest { |public fun function(): kotlin.Unit { | codeWithNoNewline() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -994,7 +1039,8 @@ class FunSpecTest { |public fun function(): kotlin.Unit { | codeWithNoNewline() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1007,7 +1053,8 @@ class FunSpecTest { assertThat(methodSpec.toString()).isEqualTo( """ |public fun function() = codeWithNoNewline() - |""".trimMargin() + | + """.trimMargin() ) } @@ -1019,7 +1066,8 @@ class FunSpecTest { assertThat(methodSpec.toString()).isEqualTo( """ |public fun function() = codeWithNoNewline() - |""".trimMargin() + | + """.trimMargin() ) } @@ -1035,7 +1083,8 @@ class FunSpecTest { | */ |public fun function(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1052,7 +1101,8 @@ class FunSpecTest { | */ |public fun function(): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1074,7 +1124,8 @@ class FunSpecTest { | |public fun (@Annotation () -> Unit).foo(): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1096,7 +1147,8 @@ class FunSpecTest { | |public fun foo(): @Annotation () -> Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/KotlinPoetTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/KotlinPoetTest.kt index 48aa6b9aed..ba357c4caa 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/KotlinPoetTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/KotlinPoetTest.kt @@ -62,7 +62,8 @@ class KotlinPoetTest { |public class E | |public val f: String = "F" - |""".trimMargin() + | + """.trimMargin() ) } @@ -102,7 +103,8 @@ class KotlinPoetTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -164,7 +166,8 @@ class KotlinPoetTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -196,7 +199,8 @@ class KotlinPoetTest { | | public var sauce: String = "chipotle mayo" |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -235,7 +239,8 @@ class KotlinPoetTest { | private fun d(): Unit { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -281,7 +286,7 @@ class KotlinPoetTest { |whoa |"raw" |string - """.trimMargin() + """.trimMargin() ) .addStatement( "val d = %S", @@ -290,7 +295,7 @@ class KotlinPoetTest { |string |with |${'$'}a interpolated value - """.trimMargin() + """.trimMargin() ) .build() ) @@ -388,7 +393,8 @@ class KotlinPoetTest { | public fun addCheese(kind: String = "monterey jack"): Unit { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -409,7 +415,8 @@ class KotlinPoetTest { |import kotlin.String | |public fun String.shrink(): String = substring(0, length - 1) - |""".trimMargin() + | + """.trimMargin() ) } @@ -435,7 +442,8 @@ class KotlinPoetTest { |import kotlin.String | |public fun ((String) -> String).shrink(): String = substring(0, length - 1) - |""".trimMargin() + | + """.trimMargin() ) } @@ -462,7 +470,8 @@ class KotlinPoetTest { |import kotlin.Unit | |public fun ((name: String) -> Unit).whatever(): Unit = Unit - |""".trimMargin() + | + """.trimMargin() ) } @@ -499,7 +508,8 @@ class KotlinPoetTest { | Int, | age: Long, |) -> Unit).whatever(): Unit = Unit - |""".trimMargin() + | + """.trimMargin() ) } @@ -526,7 +536,7 @@ class KotlinPoetTest { |public val String.extensionProperty: Int | get() = length | - """.trimMargin() + """.trimMargin() ) } @@ -558,7 +568,7 @@ class KotlinPoetTest { |public val ((String) -> String).extensionProperty: Int | get() = length | - """.trimMargin() + """.trimMargin() ) } @@ -606,7 +616,8 @@ class KotlinPoetTest { | println("setter") | field = value | } - |""".trimMargin() + | + """.trimMargin() ) } @@ -626,7 +637,8 @@ class KotlinPoetTest { | |private val foo: Foo? = | DefaultFooRegistry.getInstance().getDefaultFooInstanceForPropertiesFiles(file) - |""".trimMargin() + | + """.trimMargin() ) } @@ -679,7 +691,8 @@ class KotlinPoetTest { |public abstract class B : A() { | public final override lateinit var q: String |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -718,7 +731,8 @@ class KotlinPoetTest { | | internal final tailrec inline fun loop(): String = "a" |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -739,7 +753,8 @@ class KotlinPoetTest { |import kotlin.String | |public fun addA(s: String): String = s + "a" - |""".trimMargin() + | + """.trimMargin() ) } @@ -779,7 +794,8 @@ class KotlinPoetTest { | |public fun foo(bar: suspend (Foo) -> Bar): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -808,7 +824,8 @@ class KotlinPoetTest { |public fun timeout(duration: Long, timeUnit: TimeUnit = TimeUnit.MILLISECONDS): Unit { | this.timeout = timeUnit.toMillis(duration) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -849,7 +866,8 @@ class KotlinPoetTest { | // dynamics are dangerous! | println(d1 - d2) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -882,7 +900,8 @@ class KotlinPoetTest { | @JvmField | public val foo: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -910,7 +929,8 @@ class KotlinPoetTest { | |public fun foo(a: List<@JvmSuppressWildcards Int>): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -954,7 +974,8 @@ class KotlinPoetTest { | } | , |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -985,7 +1006,8 @@ class KotlinPoetTest { |public class AlarmInfo( | public val `when`: Float, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -1009,7 +1031,8 @@ class KotlinPoetTest { | fun functionWithAPrettyLongNameThatWouldCauseWrapping(parameterWithALongNameThatWouldAlsoCauseWrapping: String): | Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1056,7 +1079,8 @@ class KotlinPoetTest { | ) | public val name: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -1104,7 +1128,8 @@ class KotlinPoetTest { | return this | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1128,7 +1153,8 @@ class KotlinPoetTest { |public fun main(): Unit { | println(${'"'}""Here's a taco: ${'$'}{Taco()}""${'"'}) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1154,7 +1180,8 @@ class KotlinPoetTest { | val ints = arrayOf(1, 2, 3) | println(${'"'}""${'$'}{ints.contentToString()}""${'"'}) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1186,7 +1213,8 @@ class KotlinPoetTest { | */ |public fun test(a: kotlin.Int, b: kotlin.Int): kotlin.Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1220,7 +1248,8 @@ class KotlinPoetTest { | public fun test(e: Exception): Unit { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1257,7 +1286,8 @@ class KotlinPoetTest { | public val `_`: Float, | public val `____`: Float, |) - |""".trimMargin() + | + """.trimMargin() ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrapperTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrapperTest.kt index 88300d5129..72ec76bf77 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrapperTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrapperTest.kt @@ -28,7 +28,7 @@ class LineWrapperTest { """ |abcde | fghij - """.trimMargin() + """.trimMargin() ) } @@ -50,7 +50,7 @@ class LineWrapperTest { |ab cd ef | gh ij kl | mn op qr - """.trimMargin() + """.trimMargin() ) } @@ -65,7 +65,7 @@ class LineWrapperTest { """ |abcdefghij | klmnop - """.trimMargin() + """.trimMargin() ) } @@ -95,7 +95,7 @@ class LineWrapperTest { """ |abcde fghi |jklmnopqrstuvwxy - """.trimMargin() + """.trimMargin() ) } @@ -110,7 +110,7 @@ class LineWrapperTest { |abcde | fghij |klmnopqrstuvwxy - """.trimMargin() + """.trimMargin() ) } @@ -124,7 +124,7 @@ class LineWrapperTest { |abcde fghi |klmnopq |r stuvwxyz - """.trimMargin() + """.trimMargin() ) } @@ -139,7 +139,7 @@ class LineWrapperTest { |klmnopq |rs | tuvwxyz1 - """.trimMargin() + """.trimMargin() ) } @@ -153,7 +153,7 @@ class LineWrapperTest { |a + | b + | c - """.trimMargin() + """.trimMargin() ) } @@ -167,7 +167,7 @@ class LineWrapperTest { |a - | b - | c - """.trimMargin() + """.trimMargin() ) } @@ -181,7 +181,7 @@ class LineWrapperTest { """ |ab cd | efgh ij kl mn - """.trimMargin() + """.trimMargin() ) } @@ -195,7 +195,7 @@ class LineWrapperTest { """ |ab cd | efgh ij kl mn - """.trimMargin() + """.trimMargin() ) } @@ -207,7 +207,7 @@ class LineWrapperTest { assertThat(out.toString()).isEqualTo( """ | -1 - """.trimMargin() + """.trimMargin() ) } @@ -226,7 +226,7 @@ class LineWrapperTest { | * e f g h i j | * k l m n | */ - """.trimMargin() + """.trimMargin() ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrappingTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrappingTest.kt index 0360bf1e30..3a8cf208a2 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrappingTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrappingTest.kt @@ -33,7 +33,8 @@ class LineWrappingTest { | |public fun wrapMe() = 10000000000 * 20000000000 * 30000000000 * 40000000000 * 50000000000 * | 60000000000 * 70000000000 * 80000000000 * 90000000000 * 10000000000 * 20000000000 * 30000000000 - |""".trimMargin() + | + """.trimMargin() ) } @@ -51,7 +52,8 @@ class LineWrappingTest { | |public fun wrapMe() = | "Aaaa Aaaa"+"Bbbb Bbbb"+"Cccc Cccc"+"Dddd Dddd"+"Eeee Eeee"+"Ffff Ffff"+"Gggg Gggg"+"Hhhh Hhhh"+"Iiii Iiii"+"Jjjj Jjjj"+"Kkkk Kkkk"+"Llll Llll" - |""".trimMargin() + | + """.trimMargin() ) } @@ -69,7 +71,8 @@ class LineWrappingTest { | |public fun wrapMe() = | 10000000000 * 20000000000 * 30000000000 * 40000000000 * 50000000000 * 60000000000 * 70000000000 * 80000000000 * 90000000000 * 10000000000 * 20000000000 * 30000000000 - |""".trimMargin() + | + """.trimMargin() ) } @@ -82,7 +85,8 @@ class LineWrappingTest { |package com.squareup.tacos | |public fun wrapMe() = "a·b" - |""".trimMargin() + | + """.trimMargin() ) } @@ -105,7 +109,8 @@ class LineWrappingTest { | val c = 512 | val d = 4096 |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -130,7 +135,8 @@ class LineWrappingTest { | val dddddd = | "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -1 |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -193,7 +199,8 @@ class LineWrappingTest { | "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31") | } |} - |""".trimMargin() + | + """.trimMargin() ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/MemberNameTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/MemberNameTest.kt index 038a687851..3dc21988f7 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/MemberNameTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/MemberNameTest.kt @@ -45,7 +45,8 @@ class MemberNameTest { | val randomTaco = randomTaco() | val bestTaco = bestTacoEver |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -69,7 +70,8 @@ class MemberNameTest { |public fun makeTastyTacos(): Unit { | createTaco() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -91,7 +93,8 @@ class MemberNameTest { |public fun makeTastyTacos(): Unit { | createTaco() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -117,7 +120,8 @@ class MemberNameTest { |public fun makeTastyTacos(): Unit { | createTaco() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -143,7 +147,8 @@ class MemberNameTest { | createTaco() | com.twitter.tacos.createTaco() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -172,7 +177,8 @@ class MemberNameTest { | createTaco() | TwitterTacos.Companion.createTaco() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -198,7 +204,8 @@ class MemberNameTest { | val tacos = SquareTacos() | com.squareup.tacos.math.SquareTacos(tacos) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -234,7 +241,8 @@ class MemberNameTest { | public fun error(): Unit { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -277,7 +285,8 @@ class MemberNameTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -320,7 +329,8 @@ class MemberNameTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -349,7 +359,8 @@ class MemberNameTest { | createSquareTaco() | createTwitterTaco() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -381,7 +392,8 @@ class MemberNameTest { | `when`(tacoService.createTaco()).thenReturn(tastyTaco()) | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -410,7 +422,8 @@ class MemberNameTest { | `when`() | TwitterTacos.Companion.`when`() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -437,7 +450,8 @@ class MemberNameTest { | val randomTacoFactory = ::randomTaco | val bestTacoFactory = TacoTruck::bestTacoEver |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -460,7 +474,8 @@ class MemberNameTest { |public fun main(): Unit { | println(`produce tacos`()) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -504,7 +519,8 @@ class MemberNameTest { |public fun packageTacos(tacos: List, packager: TacoPackager): Unit { | packager.`package`(tacos) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -540,7 +556,8 @@ class MemberNameTest { | } | return taco |} - |""".trimMargin() + | + """.trimMargin() ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterSpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterSpecTest.kt index 30e65ab42c..7a51f8e3d9 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterSpecTest.kt @@ -106,7 +106,8 @@ class ParameterSpecTest { |parameter: com.example.SomeTypeAlias = { arg: kotlin.Any -> | println("arg=${'$'}arg") |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -128,7 +129,8 @@ class ParameterSpecTest { | |public fun foo(bar: @Annotation () -> Unit): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/PropertySpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/PropertySpecTest.kt index ac74aa0ed0..c7a0439088 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/PropertySpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/PropertySpecTest.kt @@ -57,7 +57,8 @@ class PropertySpecTest { """ |var foo: kotlin.String | private set - |""".trimMargin() + | + """.trimMargin() ) } @@ -95,7 +96,8 @@ class PropertySpecTest { |var foo: kotlin.String | external get | external set - |""".trimMargin() + | + """.trimMargin() ) } @@ -126,7 +128,8 @@ class PropertySpecTest { """ |inline val foo: kotlin.String | get() = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -145,7 +148,8 @@ class PropertySpecTest { """ |var foo: kotlin.String | inline get() = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -172,7 +176,8 @@ class PropertySpecTest { | get() = "foo" | set(`value`) { | } - |""".trimMargin() + | + """.trimMargin() ) } @@ -205,7 +210,8 @@ class PropertySpecTest { assertThat(prop.toString()).isEqualTo( """ |val `object`: kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -216,7 +222,8 @@ class PropertySpecTest { assertThat(prop.toString()).isEqualTo( """ |var `object`: kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -228,7 +235,8 @@ class PropertySpecTest { assertThat(prop.toString()).isEqualTo( """ |external val foo: kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -239,7 +247,8 @@ class PropertySpecTest { assertThat(prop.toString()).isEqualTo( """ |val `with-hyphen`: kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -319,7 +328,8 @@ class PropertySpecTest { """ |private inline val kotlin.reflect.KClass.someFunction: T | get() = stuff as T - |""".trimMargin() + | + """.trimMargin() ) } @@ -340,7 +350,8 @@ class PropertySpecTest { """ |private val java.util.function.Function.`property`: kotlin.String where T : java.io.Serializable, T : kotlin.Cloneable | get() = "" - |""".trimMargin() + | + """.trimMargin() ) } @@ -360,7 +371,8 @@ class PropertySpecTest { """ |private inline val kotlin.reflect.KClass.someFunction: T | get() = stuff as T - |""".trimMargin() + | + """.trimMargin() ) } @@ -461,7 +473,8 @@ class PropertySpecTest { | println("arg=${'$'}arg") |} | - |""".trimMargin() + | + """.trimMargin() ) } @@ -491,7 +504,8 @@ class PropertySpecTest { | * The topping you want on your pizza | */ |val topping: kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -505,7 +519,8 @@ class PropertySpecTest { | * The topping you want on your pizza | */ |val topping: kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -527,7 +542,8 @@ class PropertySpecTest { | * Simple multiplier | */ | get() = field * 5 - |""".trimMargin() + | + """.trimMargin() ) } @@ -547,7 +563,8 @@ class PropertySpecTest { |import kotlin.String | |public const val FOO: String = "This is a long string with a newline\nin the middle." - |""".trimMargin() + | + """.trimMargin() ) } @@ -564,7 +581,8 @@ class PropertySpecTest { |import kotlin.Unit | |public val foo: @Annotation () -> Unit - |""".trimMargin() + | + """.trimMargin() ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeAliasSpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeAliasSpecTest.kt index 357a14125b..f8edc7a994 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeAliasSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeAliasSpecTest.kt @@ -32,7 +32,8 @@ class TypeAliasSpecTest { assertThat(typeAliasSpec.toString()).isEqualTo( """ |public typealias Word = kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -46,7 +47,8 @@ class TypeAliasSpecTest { assertThat(typeAliasSpec.toString()).isEqualTo( """ |public typealias Word = kotlin.collections.List - |""".trimMargin() + | + """.trimMargin() ) } @@ -59,7 +61,8 @@ class TypeAliasSpecTest { assertThat(typeAliasSpec.toString()).isEqualTo( """ |public typealias Word = kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -72,7 +75,8 @@ class TypeAliasSpecTest { assertThat(typeAliasSpec.toString()).isEqualTo( """ |internal typealias Word = kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -85,7 +89,8 @@ class TypeAliasSpecTest { assertThat(typeAliasSpec.toString()).isEqualTo( """ |private typealias Word = kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -100,7 +105,8 @@ class TypeAliasSpecTest { assertThat(typeAliasSpec.toString()).isEqualTo( """ |public actual typealias AtomicRef = java.util.concurrent.atomic.AtomicReference - |""".trimMargin() + | + """.trimMargin() ) } @@ -116,7 +122,8 @@ class TypeAliasSpecTest { | * Word is just a type alias for [String](kotlin.String). | */ |public typealias Word = kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -134,7 +141,8 @@ class TypeAliasSpecTest { """ |@com.squareup.kotlinpoet.TypeAliasAnnotation(value = "words!") |public typealias Word = kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -150,7 +158,8 @@ class TypeAliasSpecTest { | * Word is just a type alias for [String](kotlin.String). | */ |public typealias Word = kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -219,7 +228,8 @@ class TypeAliasSpecTest { assertThat(typeAlias.toString()).isEqualTo( """ |public typealias `fun` = kotlin.String - |""".trimMargin() + | + """.trimMargin() ) } @@ -230,7 +240,8 @@ class TypeAliasSpecTest { assertThat(spec.toString()).isEqualTo( """ |public typealias lambda = @Annotation () -> kotlin.Unit - |""".trimMargin() + | + """.trimMargin() ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeSpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeSpecTest.kt index c7d182d08b..c281a53c34 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeSpecTest.kt @@ -83,7 +83,8 @@ class TypeSpecTest { |public class Taco { | public final override fun toString(): String = "taco" |} - |""".trimMargin() + | + """.trimMargin() ) assertEquals(1906837485, taco.hashCode().toLong()) // Update expected number if source changes. } @@ -114,7 +115,8 @@ class TypeSpecTest { | | public val inString: List |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -177,7 +179,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -205,7 +208,8 @@ class TypeSpecTest { | public val names: ArrayList = object : ArrayList(4) { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -243,7 +247,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -266,7 +271,8 @@ class TypeSpecTest { | public val NAME: Any = object { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -323,7 +329,8 @@ class TypeSpecTest { | /* code snippets */ | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -351,7 +358,8 @@ class TypeSpecTest { |public class EthicalTaco { | public val meat: @FreeRange String |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -429,7 +437,8 @@ class TypeSpecTest { | @Header("Authorization") authorization: String, | ): Observable |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -455,7 +464,8 @@ class TypeSpecTest { | @JsonAdapter(Foo::class) | private val thing: String |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -482,7 +492,8 @@ class TypeSpecTest { | @field:JsonAdapter(Foo::class) | private val thing: String |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -508,7 +519,8 @@ class TypeSpecTest { | "goodbye", |) |public class Foo - |""".trimMargin() + | + """.trimMargin() ) } @@ -579,7 +591,8 @@ class TypeSpecTest { | this("fist") | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -618,7 +631,8 @@ class TypeSpecTest { | | public abstract fun fold(): Unit |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -640,7 +654,8 @@ class TypeSpecTest { | | public abstract fun fold(): Unit |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -662,7 +677,8 @@ class TypeSpecTest { |public class Variable( | public vararg val name: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -695,7 +711,8 @@ class TypeSpecTest { | return field | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -732,7 +749,8 @@ class TypeSpecTest { | field = value | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -757,7 +775,8 @@ class TypeSpecTest { | ; | public companion object |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -787,7 +806,8 @@ class TypeSpecTest { | public override fun toString(): String = "west side" | }, |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -816,7 +836,8 @@ class TypeSpecTest { | PAPER, | SCISSORS, |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -872,7 +893,8 @@ class TypeSpecTest { | @Throws(IOException::class) | public external fun nativeThrow(): Unit |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -932,7 +954,8 @@ class TypeSpecTest { | y: P, | ): Location = throw UnsupportedOperationException("TODO") |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -962,7 +985,8 @@ class TypeSpecTest { | | public val y: @A Q |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -984,7 +1008,8 @@ class TypeSpecTest { |import kotlin.Comparable | |public abstract class Taco : AbstractSet(), Serializable, Comparable - |""".trimMargin() + | + """.trimMargin() ) } @@ -1004,7 +1029,8 @@ class TypeSpecTest { |import kotlin.Comparable | |public class Taco : org.fish.taco.Taco(), Comparable, com.taco.bell.Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -1030,7 +1056,8 @@ class TypeSpecTest { |public class Outer : Callable() { | public inner class Inner |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1052,7 +1079,8 @@ class TypeSpecTest { | LEAN_GROUND_BEEF, | SHREDDED_CHEESE, |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1087,7 +1115,8 @@ class TypeSpecTest { | `open`(0), | closed(1), |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1105,7 +1134,8 @@ class TypeSpecTest { |import kotlin.Comparable | |public interface Taco : Serializable, Comparable - |""".trimMargin() + | + """.trimMargin() ) } @@ -1132,7 +1162,8 @@ class TypeSpecTest { | public fun notSam(): Unit { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1235,7 +1266,8 @@ class TypeSpecTest { | FIRE, | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1266,7 +1298,8 @@ class TypeSpecTest { |public annotation class MyAnnotation( | public val test: Int, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -1335,7 +1368,8 @@ class TypeSpecTest { | public const val QUANTITY_DEFAULT: Int = 10000 | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1365,7 +1399,8 @@ class TypeSpecTest { |annotation class Bar() { | fun value(): Deprecated default @Deprecated |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1383,7 +1418,8 @@ class TypeSpecTest { |public interface Taco { | public val v: Int |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1400,7 +1436,8 @@ class TypeSpecTest { |public expect class ClassA { | public fun test(): kotlin.Unit |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1423,7 +1460,8 @@ class TypeSpecTest { | public fun test(): kotlin.Unit | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1446,7 +1484,8 @@ class TypeSpecTest { | public fun test(): kotlin.Unit | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1475,7 +1514,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1510,7 +1550,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1539,7 +1580,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1574,7 +1616,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1608,7 +1651,8 @@ class TypeSpecTest { | private fun aPrivateMethod(): Unit { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1682,7 +1726,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1706,7 +1751,8 @@ class TypeSpecTest { | | public val externalOther: com.squareup.donuts.Other |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1731,7 +1777,8 @@ class TypeSpecTest { |public class Taco { | public fun getComparator(): T where T : Comparator, T : Serializable = null |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1748,7 +1795,8 @@ class TypeSpecTest { |public class Taco { | public val ints: IntArray |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1803,7 +1851,8 @@ class TypeSpecTest { | public fun refold(locale: Locale): Unit { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1823,7 +1872,8 @@ class TypeSpecTest { |Taco temperature. Can be as cold as the famous ice tacos from |the Andes, or hot with lava-like cheese from the depths of |the Ninth Circle. - |""".trimMargin() + | + """.trimMargin() ) ) .build() @@ -1887,7 +1937,8 @@ class TypeSpecTest { | public val mild: Boolean, | private val nodoc: Int, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -1923,7 +1974,8 @@ class TypeSpecTest { | options = [Option("taco", Beef::class), Option("quesadilla", Chicken::class)], |) |public class Menu - |""".trimMargin() + | + """.trimMargin() ) } @@ -1948,7 +2000,8 @@ class TypeSpecTest { | public fun prepare(workers: Int, vararg jobs: Runnable): Unit { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1979,7 +2032,8 @@ class TypeSpecTest { | ): Unit { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2055,7 +2109,8 @@ class TypeSpecTest { | return size | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2087,7 +2142,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2119,7 +2175,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2145,7 +2202,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2178,7 +2236,8 @@ class TypeSpecTest { | SALSA, | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2239,7 +2298,8 @@ class TypeSpecTest { | | public class Y |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2261,7 +2321,8 @@ class TypeSpecTest { |public class Taco { | public external fun nativeInt(): Int |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2282,7 +2343,8 @@ class TypeSpecTest { |public class Taco { | public val NULL: String = null |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2364,7 +2426,8 @@ class TypeSpecTest { |object : java.lang.Runnable { | public override fun run(): kotlin.Unit { | } - |}""".trimMargin() + |} + """.trimMargin() ) } @@ -2374,7 +2437,8 @@ class TypeSpecTest { assertThat(type.toString()).isEqualTo( """ |public interface Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -2384,7 +2448,8 @@ class TypeSpecTest { assertThat(type.toString()).isEqualTo( """ |public annotation class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -2422,7 +2487,8 @@ class TypeSpecTest { | return result | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2494,7 +2560,8 @@ class TypeSpecTest { | }) | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2520,7 +2587,8 @@ class TypeSpecTest { | |cheese | |${"\"\"\""}.trimMargin() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2545,7 +2613,8 @@ class TypeSpecTest { |@SuppressWarnings("unchecked") |@Deprecated |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -2570,7 +2639,8 @@ class TypeSpecTest { | | private val price: BigDecimal |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2606,7 +2676,8 @@ class TypeSpecTest { | */ | public fun getRandomQuantity(): Int = 4 |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2627,7 +2698,8 @@ class TypeSpecTest { |import java.util.EventListener | |public class Taco : Serializable, EventListener - |""".trimMargin() + | + """.trimMargin() ) } @@ -2647,7 +2719,8 @@ class TypeSpecTest { |import kotlin.Number | |public class Location - |""".trimMargin() + | + """.trimMargin() ) } @@ -2669,7 +2742,8 @@ class TypeSpecTest { | | public class Sauce |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2702,7 +2776,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2736,7 +2811,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2768,7 +2844,8 @@ class TypeSpecTest { | else -> throw IllegalToppingException(topping) | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -2957,7 +3034,8 @@ class TypeSpecTest { | | public override fun toString(): String = FOO |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3002,7 +3080,8 @@ class TypeSpecTest { | | public override fun toString(): String = FOO |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3055,7 +3134,8 @@ class TypeSpecTest { | | public override fun toString(): String = FOO |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3248,7 +3328,8 @@ class TypeSpecTest { | public fun test(): Unit { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3279,7 +3360,8 @@ class TypeSpecTest { | public fun test(): Unit { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3317,7 +3399,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3356,7 +3439,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3381,7 +3465,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3411,7 +3496,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3447,7 +3533,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3498,7 +3585,8 @@ class TypeSpecTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3533,7 +3621,8 @@ class TypeSpecTest { | public val a: Int, | public val b: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -3572,7 +3661,8 @@ class TypeSpecTest { | public val a: Int, | public val b: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -3594,7 +3684,7 @@ class TypeSpecTest { | |public class Taco @Inject constructor() | - """.trimMargin() + """.trimMargin() ) } @@ -3613,7 +3703,7 @@ class TypeSpecTest { | |public class Taco internal constructor() | - """.trimMargin() + """.trimMargin() ) } @@ -3636,7 +3726,7 @@ class TypeSpecTest { | |public class Taco @Inject internal constructor() | - """.trimMargin() + """.trimMargin() ) } @@ -3662,7 +3752,7 @@ class TypeSpecTest { | |public class Taco @Inject @Named internal constructor() | - """.trimMargin() + """.trimMargin() ) } @@ -3692,7 +3782,8 @@ class TypeSpecTest { | | public val nullTaco: String? = null |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3708,7 +3799,8 @@ class TypeSpecTest { |package com.squareup.tacos | |public class Foo : Bar("foo", 42) - |""".trimMargin() + | + """.trimMargin() ) } @@ -3734,7 +3826,8 @@ class TypeSpecTest { |public class IoException : Exception { | public constructor() |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3750,7 +3843,8 @@ class TypeSpecTest { |import java.lang.Exception | |public class IoException : Exception() - |""".trimMargin() + | + """.trimMargin() ) } @@ -3806,7 +3900,8 @@ class TypeSpecTest { | public val a: Int = 1, | public val b: String? = null, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -3860,7 +3955,8 @@ class TypeSpecTest { |) { | public constructor(map: Map) : this(map["a"], map["b"], map["c"]) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -3975,7 +4071,8 @@ class TypeSpecTest { | public override val name: String, | public override val surname: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -4015,7 +4112,8 @@ class TypeSpecTest { | @Id | private val id: Int = 1, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -4063,7 +4161,8 @@ class TypeSpecTest { | lateinit var taco3: String | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -4089,7 +4188,8 @@ class TypeSpecTest { |public class Guac( | somethingElse: String, |) : Consumer by ({ println(it) }) - |""".trimMargin() + | + """.trimMargin() assertThat(toString(type)).isEqualTo(expect) } @@ -4109,7 +4209,8 @@ class TypeSpecTest { |import kotlin.String | |public object Guac : Consumer by ({ println(it) }) - |""".trimMargin() + | + """.trimMargin() assertThat(toString(type)).isEqualTo(expect) } @@ -4141,7 +4242,8 @@ class TypeSpecTest { | |public class StringToInteger() : Function by Function ({ text -> text.toIntOrNull() ?: | 0 }), Runnable by Runnable ({ Logger.debug("Hello world") }) - |""".trimMargin() + | + """.trimMargin() assertThat(toString(type)).isEqualTo(expect) } @@ -4186,7 +4288,8 @@ class TypeSpecTest { |public class Taco( | superString: Function, |) : Function by superString - |""".trimMargin() + | + """.trimMargin() ) } @@ -4239,7 +4342,8 @@ class TypeSpecTest { |public class EntityBuilder( | argBuilder: Payload = Payload.create(), |) : TypeBuilder by argBuilder - |""".trimMargin() + | + """.trimMargin() ) } @@ -4258,7 +4362,8 @@ class TypeSpecTest { |public external class Foo { | public fun bar(): Unit |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -4281,7 +4386,8 @@ class TypeSpecTest { | | public fun bar(): Unit |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -4304,7 +4410,8 @@ class TypeSpecTest { | | public fun bar(): Unit |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -4350,7 +4457,8 @@ class TypeSpecTest { | public fun qux(): Unit | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -4435,7 +4543,8 @@ class TypeSpecTest { |) { | public constructor(anotherTaco: Taco) : this(java.sql.Taco.defaultInstance(), 0) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -4540,7 +4649,8 @@ class TypeSpecTest { assertThat(spec.toString()).isEqualTo( """ |public enum class Topping - |""".trimMargin() + | + """.trimMargin() ) } @@ -4555,7 +4665,8 @@ class TypeSpecTest { | * blah blah | */ |public class Foo - |""".trimMargin() + | + """.trimMargin() ) } @@ -4575,7 +4686,8 @@ class TypeSpecTest { | */ | public val bar: kotlin.String |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -4638,7 +4750,8 @@ class TypeSpecTest { | */ | public val third: kotlin.Int, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -4662,7 +4775,8 @@ class TypeSpecTest { | */ | first: kotlin.Int, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -4692,7 +4806,8 @@ class TypeSpecTest { | return 42 | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -4722,7 +4837,8 @@ class TypeSpecTest { | `test test`, | `0constants`, |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -4877,7 +4993,8 @@ class TypeSpecTest { | */ | public val mild: Boolean, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -4894,7 +5011,8 @@ class TypeSpecTest { |public enum class MyEnum { | `object`, |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -4931,7 +5049,8 @@ class TypeSpecTest { | `header`(1), | `impl`(2), |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -4940,7 +5059,8 @@ class TypeSpecTest { assertThat(type.toString()).isEqualTo( """ |public class `fun` - |""".trimMargin() + | + """.trimMargin() ) } @@ -4955,7 +5075,8 @@ class TypeSpecTest { |public fun printTaco(taco: com.squareup.tacos.Taco.`object`): kotlin.Unit { | print(taco) |} - |""".trimMargin() + | + """.trimMargin() ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeVariableNameTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeVariableNameTest.kt index dc25fed5a1..4a45e3df2c 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeVariableNameTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeVariableNameTest.kt @@ -35,7 +35,8 @@ class TypeVariableNameTest { assertThat(funSpec.toString()).isEqualTo( """ |public fun foo(): T? = null - |""".trimMargin() + | + """.trimMargin() ) } @@ -49,7 +50,8 @@ class TypeVariableNameTest { assertThat(funSpec.toString()).isEqualTo( """ |public fun foo(): T? = null - |""".trimMargin() + | + """.trimMargin() ) } @@ -62,7 +64,8 @@ class TypeVariableNameTest { assertThat(funSpec.toString()).isEqualTo( """ |public fun foo(): T? = null - |""".trimMargin() + | + """.trimMargin() ) } @@ -76,7 +79,8 @@ class TypeVariableNameTest { assertThat(funSpec.toString()).isEqualTo( """ |public fun foo(): T? = null - |""".trimMargin() + | + """.trimMargin() ) } @@ -89,7 +93,8 @@ class TypeVariableNameTest { assertThat(funSpec.toString()).isEqualTo( """ |public fun foo(): T? where T : java.io.Serializable, T : java.lang.Runnable = null - |""".trimMargin() + | + """.trimMargin() ) } @@ -128,7 +133,8 @@ class TypeVariableNameTest { assertThat(typeSpec.toString()).isEqualTo( """ |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -139,7 +145,8 @@ class TypeVariableNameTest { assertThat(typeSpec.toString()).isEqualTo( """ |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -150,7 +157,8 @@ class TypeVariableNameTest { assertThat(typeSpec.toString()).isEqualTo( """ |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -171,7 +179,8 @@ class TypeVariableNameTest { |public inline fun printMembers(): kotlin.Unit { | println(T::class.members) |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -182,7 +191,8 @@ class TypeVariableNameTest { assertThat(typeSpec.toString()).isEqualTo( """ |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -193,7 +203,8 @@ class TypeVariableNameTest { assertThat(typeSpec.toString()).isEqualTo( """ |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -206,7 +217,8 @@ class TypeVariableNameTest { assertThat(typeSpec.toString()).isEqualTo( """ |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -219,7 +231,8 @@ class TypeVariableNameTest { assertThat(typeSpec.toString()).isEqualTo( """ |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -232,7 +245,8 @@ class TypeVariableNameTest { assertThat(typeSpec.toString()).isEqualTo( """ |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ValueTypeSpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ValueTypeSpecTest.kt index 7554f3380c..08f1c2eef6 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ValueTypeSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ValueTypeSpecTest.kt @@ -65,7 +65,8 @@ class ValueTypeSpecTest(private val useValue: Boolean) { |public $modifierString class Guacamole( | public val avacado: kotlin.String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -92,7 +93,8 @@ class ValueTypeSpecTest(private val useValue: Boolean) { | init { | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -138,7 +140,8 @@ class ValueTypeSpecTest(private val useValue: Boolean) { |public $modifierString class Guacamole( | public val avocado: kotlin.String, |) : com.squareup.kotlinpoet.ValueTypeSpecTest.InlineSuperInterface - |""".trimMargin() + | + """.trimMargin() ) } @@ -206,7 +209,8 @@ class ValueTypeSpecTest(private val useValue: Boolean) { |public $modifierString class Guacamole private constructor( | public val avocado: kotlin.String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -245,7 +249,8 @@ class ValueTypeSpecTest(private val useValue: Boolean) { | B(2), | ; |} - |""".trimMargin() + | + """.trimMargin() ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/jvm/JvmAnnotationsTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/jvm/JvmAnnotationsTest.kt index fc123a13c0..e886e480c3 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/jvm/JvmAnnotationsTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/jvm/JvmAnnotationsTest.kt @@ -57,7 +57,8 @@ class JvmAnnotationsTest { | @JvmField | public val foo: String = "foo" |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -90,7 +91,8 @@ class JvmAnnotationsTest { | @JvmField | public val foo: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -124,7 +126,8 @@ class JvmAnnotationsTest { | public val foo: String = "foo" | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -159,7 +162,8 @@ class JvmAnnotationsTest { | public fun foo(): String = "foo" | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -198,7 +202,8 @@ class JvmAnnotationsTest { | get() = "foo" | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -240,7 +245,8 @@ class JvmAnnotationsTest { | } | } |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -274,7 +280,8 @@ class JvmAnnotationsTest { |) |public fun foo(): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -296,7 +303,8 @@ class JvmAnnotationsTest { |@Throws(IllegalTacoException::class) |public fun foo(): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -324,7 +332,8 @@ class JvmAnnotationsTest { |public class Taco @Throws(IOException::class) constructor( | foo: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -352,7 +361,8 @@ class JvmAnnotationsTest { |public val foo: String | @Throws(IOException::class) | get() = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -384,7 +394,8 @@ class JvmAnnotationsTest { | set(`value`) { | print("foo") | } - |""".trimMargin() + | + """.trimMargin() ) } @@ -414,7 +425,8 @@ class JvmAnnotationsTest { |@JvmOverloads |public fun foo(bar: Int, baz: String = "baz"): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -448,7 +460,8 @@ class JvmAnnotationsTest { | bar: Int, | baz: String = "baz", |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -485,7 +498,8 @@ class JvmAnnotationsTest { |import kotlin.jvm.JvmName | |public val foo: String = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -507,7 +521,8 @@ class JvmAnnotationsTest { |@JvmName("getFoo") |public fun foo(): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -534,7 +549,8 @@ class JvmAnnotationsTest { |public val foo: String | @JvmName("foo") | get() = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -564,7 +580,8 @@ class JvmAnnotationsTest { | @JvmName("foo") | set(`value`) { | } - |""".trimMargin() + | + """.trimMargin() ) } @@ -594,7 +611,8 @@ class JvmAnnotationsTest { |import kotlin.jvm.JvmMultifileClass | |public val foo: String = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -614,7 +632,8 @@ class JvmAnnotationsTest { | |@JvmSuppressWildcards |public class Taco - |""".trimMargin() + | + """.trimMargin() ) } @@ -636,7 +655,8 @@ class JvmAnnotationsTest { |@JvmSuppressWildcards(suppress = false) |public fun foo(): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -679,7 +699,8 @@ class JvmAnnotationsTest { | |@JvmSuppressWildcards(suppress = false) |public val foo: String = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -706,7 +727,8 @@ class JvmAnnotationsTest { | |public fun foo(a: List<@JvmSuppressWildcards Int>): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -733,7 +755,8 @@ class JvmAnnotationsTest { | |public fun foo(a: List<@JvmWildcard Int>): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -754,7 +777,8 @@ class JvmAnnotationsTest { | |@Synchronized |public fun foo() = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -781,7 +805,8 @@ class JvmAnnotationsTest { |public val foo: String | @Synchronized | get() = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -811,7 +836,8 @@ class JvmAnnotationsTest { | @Synchronized | set(`value`) { | } - |""".trimMargin() + | + """.trimMargin() ) } @@ -846,7 +872,8 @@ class JvmAnnotationsTest { | @Transient | public val foo: String = "foo" |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -879,7 +906,8 @@ class JvmAnnotationsTest { | @Transient | public val foo: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -907,7 +935,8 @@ class JvmAnnotationsTest { | @Volatile | public val foo: String = "foo" |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -940,7 +969,8 @@ class JvmAnnotationsTest { | @Volatile | public val foo: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -962,7 +992,8 @@ class JvmAnnotationsTest { |@Strictfp |public fun foo(): Unit { |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -989,7 +1020,8 @@ class JvmAnnotationsTest { |public class Taco @Strictfp constructor( | foo: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -1016,7 +1048,8 @@ class JvmAnnotationsTest { |public val foo: String | @Strictfp | get() = "foo" - |""".trimMargin() + | + """.trimMargin() ) } @@ -1047,7 +1080,8 @@ class JvmAnnotationsTest { | set(`value`) { | print("foo") | } - |""".trimMargin() + | + """.trimMargin() ) } @@ -1075,7 +1109,8 @@ class JvmAnnotationsTest { | @JvmDefault | public val foo: String = "foo" |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1104,7 +1139,8 @@ class JvmAnnotationsTest { | @JvmDefault | public fun foo(): String = "foo" |} - |""".trimMargin() + | + """.trimMargin() ) } @@ -1137,7 +1173,8 @@ class JvmAnnotationsTest { |public value class Taco( | public val `value`: String, |) - |""".trimMargin() + | + """.trimMargin() ) } @@ -1171,7 +1208,8 @@ class JvmAnnotationsTest { |public data class Taco( | public val `value`: String, |) - |""".trimMargin() + | + """.trimMargin() ) } }