diff options
author | renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> | 2022-07-21 16:38:37 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-21 16:38:37 -0400 |
commit | a1163dafc72e5724c947c07a3bd006f6baba695d (patch) | |
tree | 042ffda7446c414a6f388d6f3b48d2cc7f403128 | |
parent | fa73840b97028731291d2d93206d7ebf3642ff3d (diff) | |
download | kotlinpoet-a1163dafc72e5724c947c07a3bd006f6baba695d.tar.gz |
Update plugin spotless to v6.8.0 (#1302)
* Update plugin spotless to v6.8.0
* ktlint 0.46.1
* Fix violations
* Fix violations
* Disable rule that breaks API compat + revert changes
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Egor Andreevici <egor@squareup.com>
92 files changed, 2011 insertions, 1761 deletions
diff --git a/.editorconfig b/.editorconfig index 3ac56613..dae2b79d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,6 +7,7 @@ trim_trailing_whitespace = true insert_final_newline = true [*.{kt,kts}] +disabled_rules = filename ij_kotlin_imports_layout = * ij_kotlin_allow_trailing_comma = true ij_kotlin_allow_trailing_comma_on_call_site = true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 22649185..51338a2a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,13 +16,13 @@ kotlin = "1.7.10" kct = "1.4.9" ksp = "1.7.10-1.0.6" -ktlint = "0.45.2" +ktlint = "0.46.1" [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } dokka = { id = "org.jetbrains.dokka", version = "1.7.10" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -spotless = { id = "com.diffplug.spotless", version = "6.7.2" } +spotless = { id = "com.diffplug.spotless", version = "6.8.0" } mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.21.0" } kotlinBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.11.0" } diff --git a/interop/javapoet/src/main/kotlin/com/squareup/kotlinpoet/javapoet/k2jInterop.kt b/interop/javapoet/src/main/kotlin/com/squareup/kotlinpoet/javapoet/K2jInterop.kt index 2e0abe2b..82d7374a 100644 --- a/interop/javapoet/src/main/kotlin/com/squareup/kotlinpoet/javapoet/k2jInterop.kt +++ b/interop/javapoet/src/main/kotlin/com/squareup/kotlinpoet/javapoet/K2jInterop.kt @@ -103,7 +103,7 @@ public fun KParameterizedTypeName.toJParameterizedOrArrayTypeName(): JTypeName { else -> { JParameterizedTypeName.get( rawType.toJClassName() as JClassName, - *typeArguments.map { it.toJTypeName(boxIfPrimitive = true) }.toTypedArray() + *typeArguments.map { it.toJTypeName(boxIfPrimitive = true) }.toTypedArray(), ) } } diff --git a/interop/javapoet/src/test/kotlin/com/squareup/kotlinpoet/javapoet/PoetInteropTest.kt b/interop/javapoet/src/test/kotlin/com/squareup/kotlinpoet/javapoet/PoetInteropTest.kt index db849ed7..b622e6b4 100644 --- a/interop/javapoet/src/test/kotlin/com/squareup/kotlinpoet/javapoet/PoetInteropTest.kt +++ b/interop/javapoet/src/test/kotlin/com/squareup/kotlinpoet/javapoet/PoetInteropTest.kt @@ -136,7 +136,7 @@ class PoetInteropTest { val inKType = typeNameOf<GenericType<in String>>() val superJType = JParameterizedTypeName.get( JClassName.get(GenericType::class.java), - JWildcardTypeName.supertypeOf(String::class.java) + JWildcardTypeName.supertypeOf(String::class.java), ) assertThat(inKType.toJTypeName()).isEqualTo(superJType) assertThat(superJType.toKTypeName()).isEqualTo(inKType) @@ -144,7 +144,7 @@ class PoetInteropTest { val outKType = typeNameOf<GenericType<out String>>() val extendsJType = JParameterizedTypeName.get( JClassName.get(GenericType::class.java), - JWildcardTypeName.subtypeOf(String::class.java) + JWildcardTypeName.subtypeOf(String::class.java), ) assertThat(outKType.toJTypeName()).isEqualTo(extendsJType) assertThat(extendsJType.toKTypeName()).isEqualTo(outKType) @@ -152,7 +152,7 @@ class PoetInteropTest { val star = typeNameOf<GenericType<*>>() val extendsObjectJType = JParameterizedTypeName.get( JClassName.get(GenericType::class.java), - JWildcardTypeName.subtypeOf(JTypeName.OBJECT) + JWildcardTypeName.subtypeOf(JTypeName.OBJECT), ) assertThat(star.toJTypeName()).isEqualTo(extendsObjectJType) assertThat(extendsObjectJType.toKTypeName()).isEqualTo(star) @@ -171,9 +171,9 @@ class PoetInteropTest { JParameterizedTypeName.get( JClassName.get(Map::class.java), JClassName.INT.box(), - ArrayTypeName.of(JClassName.INT) - ) - ) + ArrayTypeName.of(JClassName.INT), + ), + ), ) assertThat(complexType.toJTypeName()).isEqualTo(jType) diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/flags.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/Flags.kt index 78b0cc98..4745dda0 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/flags.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/Flags.kt @@ -30,142 +30,203 @@ import kotlinx.metadata.KmValueParameter // Common flags for any element with flags. @KotlinPoetMetadataPreview public val Flags.hasAnnotations: Boolean get() = Flag.HAS_ANNOTATIONS(this) + @KotlinPoetMetadataPreview public val Flags.isAbstract: Boolean get() = Flag.IS_ABSTRACT(this) + @KotlinPoetMetadataPreview public val Flags.isFinal: Boolean get() = Flag.IS_FINAL(this) + @KotlinPoetMetadataPreview public val Flags.isInternal: Boolean get() = Flag.IS_INTERNAL(this) + @KotlinPoetMetadataPreview public val Flags.isLocal: Boolean get() = Flag.IS_LOCAL(this) + @KotlinPoetMetadataPreview public val Flags.isOpen: Boolean get() = Flag.IS_OPEN(this) + @KotlinPoetMetadataPreview public val Flags.isPrivate: Boolean get() = Flag.IS_PRIVATE(this) + @KotlinPoetMetadataPreview public val Flags.isPrivate_to_this: Boolean get() = Flag.IS_PRIVATE_TO_THIS(this) + @KotlinPoetMetadataPreview public val Flags.isProtected: Boolean get() = Flag.IS_PROTECTED(this) + @KotlinPoetMetadataPreview public val Flags.isPublic: Boolean get() = Flag.IS_PUBLIC(this) + @KotlinPoetMetadataPreview public val Flags.isSealed: Boolean get() = Flag.IS_SEALED(this) // Type flags. @KotlinPoetMetadataPreview public val Flags.isNullableType: Boolean get() = Flag.Type.IS_NULLABLE(this) + @KotlinPoetMetadataPreview public val Flags.isSuspendType: Boolean get() = Flag.Type.IS_SUSPEND(this) // Class flags. @KotlinPoetMetadataPreview public val Flags.isAnnotationClass: Boolean get() = Flag.Class.IS_ANNOTATION_CLASS(this) + @KotlinPoetMetadataPreview public val Flags.isClass: Boolean get() = Flag.Class.IS_CLASS(this) + @KotlinPoetMetadataPreview public val Flags.isCompanionObjectClass: Boolean get() = Flag.Class.IS_COMPANION_OBJECT(this) + @KotlinPoetMetadataPreview public val Flags.isDataClass: Boolean get() = Flag.Class.IS_DATA(this) + @KotlinPoetMetadataPreview public val Flags.isEnumClass: Boolean get() = Flag.Class.IS_ENUM_CLASS(this) + @KotlinPoetMetadataPreview public val Flags.isEnumEntryClass: Boolean get() = Flag.Class.IS_ENUM_ENTRY(this) + @KotlinPoetMetadataPreview public val Flags.isExpectClass: Boolean get() = Flag.Class.IS_EXPECT(this) + @KotlinPoetMetadataPreview public val Flags.isExternalClass: Boolean get() = Flag.Class.IS_EXTERNAL(this) + @KotlinPoetMetadataPreview public val Flags.isValueClass: Boolean get() = Flag.Class.IS_VALUE(this) + @KotlinPoetMetadataPreview public val Flags.isInnerClass: Boolean get() = Flag.Class.IS_INNER(this) + @KotlinPoetMetadataPreview public val Flags.isObjectClass: Boolean get() = Flag.Class.IS_OBJECT(this) + @KotlinPoetMetadataPreview public val Flags.isInterface: Boolean get() = Flag.Class.IS_INTERFACE(this) + @KotlinPoetMetadataPreview public val Flags.isFun: Boolean get() = Flag.Class.IS_FUN(this) + @KotlinPoetMetadataPreview public val KmClass.isAnnotation: Boolean get() = flags.isAnnotationClass + @KotlinPoetMetadataPreview public val KmClass.isClass: Boolean get() = flags.isClass + @KotlinPoetMetadataPreview public val KmClass.isCompanionObject: Boolean get() = flags.isCompanionObjectClass + @KotlinPoetMetadataPreview public val KmClass.isData: Boolean get() = flags.isDataClass + @KotlinPoetMetadataPreview public val KmClass.isEnum: Boolean get() = flags.isEnumClass + @KotlinPoetMetadataPreview public val KmClass.isEnumEntry: Boolean get() = flags.isEnumEntryClass + @KotlinPoetMetadataPreview public val KmClass.isExpect: Boolean get() = flags.isExpectClass + @KotlinPoetMetadataPreview public val KmClass.isExternal: Boolean get() = flags.isExternalClass + @KotlinPoetMetadataPreview public val KmClass.isValue: Boolean get() = flags.isValueClass + @KotlinPoetMetadataPreview public val KmClass.isInner: Boolean get() = flags.isInnerClass + @KotlinPoetMetadataPreview public val KmClass.isObject: Boolean get() = flags.isObjectClass + @KotlinPoetMetadataPreview public val KmClass.isInterface: Boolean get() = flags.isInterface + @KotlinPoetMetadataPreview public val KmClass.isFun: Boolean get() = flags.isFun + @KotlinPoetMetadataPreview public val KmType.isSuspend: Boolean get() = flags.isSuspendType + @KotlinPoetMetadataPreview public val KmType.isNullable: Boolean get() = flags.isNullableType // Constructor flags. @KotlinPoetMetadataPreview public val Flags.isPrimaryConstructor: Boolean get() = !Flag.Constructor.IS_SECONDARY(this) + @KotlinPoetMetadataPreview public val KmConstructor.isPrimary: Boolean get() = flags.isPrimaryConstructor + @KotlinPoetMetadataPreview public val KmConstructor.isSecondary: Boolean get() = !isPrimary // Function flags. @KotlinPoetMetadataPreview public val Flags.isDeclarationFunction: Boolean get() = Flag.Function.IS_DECLARATION(this) + @KotlinPoetMetadataPreview public val Flags.isFakeOverrideFunction: Boolean get() = Flag.Function.IS_FAKE_OVERRIDE(this) + @KotlinPoetMetadataPreview public val Flags.isDelegationFunction: Boolean get() = Flag.Function.IS_DELEGATION(this) + @KotlinPoetMetadataPreview public val Flags.isSynthesizedFunction: Boolean get() = Flag.Function.IS_SYNTHESIZED(this) + @KotlinPoetMetadataPreview public val Flags.isOperatorFunction: Boolean get() = Flag.Function.IS_OPERATOR(this) + @KotlinPoetMetadataPreview public val Flags.isInfixFunction: Boolean get() = Flag.Function.IS_INFIX(this) + @KotlinPoetMetadataPreview public val Flags.isInlineFunction: Boolean get() = Flag.Function.IS_INLINE(this) + @KotlinPoetMetadataPreview public val Flags.isTailRecFunction: Boolean get() = Flag.Function.IS_TAILREC(this) + @KotlinPoetMetadataPreview public val Flags.isExternalFunction: Boolean get() = Flag.Function.IS_EXTERNAL(this) + @KotlinPoetMetadataPreview public val Flags.isSuspendFunction: Boolean get() = Flag.Function.IS_SUSPEND(this) + @KotlinPoetMetadataPreview public val Flags.isExpectFunction: Boolean get() = Flag.Function.IS_EXPECT(this) + @KotlinPoetMetadataPreview public val KmFunction.isDeclaration: Boolean get() = flags.isDeclarationFunction + @KotlinPoetMetadataPreview public val KmFunction.isFakeOverride: Boolean get() = flags.isFakeOverrideFunction + @KotlinPoetMetadataPreview public val KmFunction.isDelegation: Boolean get() = flags.isDelegationFunction + @KotlinPoetMetadataPreview public val KmFunction.isSynthesized: Boolean get() = flags.isSynthesizedFunction + @KotlinPoetMetadataPreview public val KmFunction.isOperator: Boolean get() = flags.isOperatorFunction + @KotlinPoetMetadataPreview public val KmFunction.isInfix: Boolean get() = flags.isInfixFunction + @KotlinPoetMetadataPreview public val KmFunction.isInline: Boolean get() = flags.isInlineFunction + @KotlinPoetMetadataPreview public val KmFunction.isTailRec: Boolean get() = flags.isTailRecFunction + @KotlinPoetMetadataPreview public val KmFunction.isExternal: Boolean get() = flags.isExternalFunction + @KotlinPoetMetadataPreview public val KmFunction.isSuspend: Boolean get() = flags.isSuspendFunction + @KotlinPoetMetadataPreview public val KmFunction.isExpect: Boolean get() = flags.isExpectFunction @@ -173,40 +234,56 @@ public val KmFunction.isExpect: Boolean get() = flags.isExpectFunction @KotlinPoetMetadataPreview public val KmValueParameter.declaresDefaultValue: Boolean get() = Flag.ValueParameter.DECLARES_DEFAULT_VALUE(flags) + @KotlinPoetMetadataPreview public val KmValueParameter.isCrossInline: Boolean get() = Flag.ValueParameter.IS_CROSSINLINE(flags) + @KotlinPoetMetadataPreview public val KmValueParameter.isNoInline: Boolean get() = Flag.ValueParameter.IS_NOINLINE(flags) // Property flags. @KotlinPoetMetadataPreview public val Flags.isFakeOverrideProperty: Boolean get() = Flag.Property.IS_FAKE_OVERRIDE(this) + @KotlinPoetMetadataPreview public val KmProperty.hasConstant: Boolean get() = Flag.Property.HAS_CONSTANT(flags) + @KotlinPoetMetadataPreview public val KmProperty.hasGetter: Boolean get() = Flag.Property.HAS_GETTER(flags) + @KotlinPoetMetadataPreview public val KmProperty.hasSetter: Boolean get() = Flag.Property.HAS_SETTER(flags) + @KotlinPoetMetadataPreview public val KmProperty.isConst: Boolean get() = Flag.Property.IS_CONST(flags) + @KotlinPoetMetadataPreview public val KmProperty.isDeclaration: Boolean get() = Flag.Property.IS_DECLARATION(flags) + @KotlinPoetMetadataPreview public val KmProperty.isDelegated: Boolean get() = Flag.Property.IS_DELEGATED(flags) + @KotlinPoetMetadataPreview public val KmProperty.isDelegation: Boolean get() = Flag.Property.IS_DELEGATION(flags) + @KotlinPoetMetadataPreview public val KmProperty.isExpect: Boolean get() = Flag.Property.IS_EXPECT(flags) + @KotlinPoetMetadataPreview public val KmProperty.isExternal: Boolean get() = Flag.Property.IS_EXTERNAL(flags) + @KotlinPoetMetadataPreview public val KmProperty.isFakeOverride: Boolean get() = flags.isFakeOverrideProperty + @KotlinPoetMetadataPreview public val KmProperty.isLateinit: Boolean get() = Flag.Property.IS_LATEINIT(flags) + @KotlinPoetMetadataPreview public val KmProperty.isSynthesized: Boolean get() = Flag.Property.IS_SYNTHESIZED(flags) + @KotlinPoetMetadataPreview public val KmProperty.isVar: Boolean get() = Flag.Property.IS_VAR(flags) + @KotlinPoetMetadataPreview public val KmProperty.isVal: Boolean get() = !isVar @@ -214,9 +291,11 @@ public val KmProperty.isVal: Boolean get() = !isVar @KotlinPoetMetadataPreview public val Flags.isPropertyAccessorExternal: Boolean get() = Flag.PropertyAccessor.IS_EXTERNAL(this) + @KotlinPoetMetadataPreview public val Flags.isPropertyAccessorInline: Boolean get() = Flag.PropertyAccessor.IS_INLINE(this) + @KotlinPoetMetadataPreview public val Flags.isPropertyAccessorNotDefault: Boolean get() = Flag.PropertyAccessor.IS_NOT_DEFAULT(this) diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/KotlinPoetMetadata.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/KotlinPoetMetadata.kt index d1223e71..6cb3c91d 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/KotlinPoetMetadata.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/KotlinPoetMetadata.kt @@ -107,6 +107,6 @@ private fun Metadata.asClassHeader(): KotlinClassHeader { data2 = data2, extraString = extraString, packageName = packageName, - extraInt = extraInt + extraInt = extraInt, ) } diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ClassInspectorUtil.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ClassInspectorUtil.kt index a1e739b5..d9caa834 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ClassInspectorUtil.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ClassInspectorUtil.kt @@ -60,7 +60,7 @@ internal object ClassInspectorUtil { private val IMPLICIT_FIELD_ANNOTATIONS = setOf( JVM_FIELD, JVM_TRANSIENT, - JVM_VOLATILE + JVM_VOLATILE, ) private val NOT_NULL = NotNull::class.asClassName() private val NULLABLE = Nullable::class.asClassName() @@ -68,7 +68,7 @@ internal object ClassInspectorUtil { private val KOTLIN_INTRINSIC_ANNOTATIONS = setOf( NOT_NULL, NULLABLE, - EXTENSION_FUNCTION_TYPE + EXTENSION_FUNCTION_TYPE, ) val KOTLIN_INTRINSIC_INTERFACES: Set<ClassName> = setOf( @@ -85,16 +85,16 @@ internal object ClassInspectorUtil { MUTABLE_LIST, MUTABLE_SET, MUTABLE_MAP, - MUTABLE_MAP_ENTRY + MUTABLE_MAP_ENTRY, ) private val KOTLIN_NULLABILITY_ANNOTATIONS = setOf( "org.jetbrains.annotations.NotNull", - "org.jetbrains.annotations.Nullable" + "org.jetbrains.annotations.Nullable", ) fun filterOutNullabilityAnnotations( - annotations: List<AnnotationSpec> + annotations: List<AnnotationSpec>, ): List<AnnotationSpec> { return annotations.filterNot { val typeName = it.typeName @@ -123,7 +123,7 @@ internal object ClassInspectorUtil { isCompanionObject: Boolean, hasGetter: Boolean, hasSetter: Boolean, - hasField: Boolean + hasField: Boolean, ): Boolean { return if (!hasGetter && !hasSetter && @@ -142,7 +142,7 @@ internal object ClassInspectorUtil { */ fun createAnnotations( siteTarget: UseSiteTarget? = null, - body: MutableCollection<AnnotationSpec>.() -> Unit + body: MutableCollection<AnnotationSpec>.() -> Unit, ): Collection<AnnotationSpec> { val result = mutableSetOf<AnnotationSpec>() .apply(body) @@ -173,13 +173,13 @@ internal object ClassInspectorUtil { */ fun createThrowsSpec( exceptions: Collection<TypeName>, - useSiteTarget: UseSiteTarget? = null + useSiteTarget: UseSiteTarget? = null, ): AnnotationSpec { return AnnotationSpec.builder(Throws::class) .addMember( "exceptionClasses = %L", exceptions.map { CodeBlock.of("%T::class", it) } - .joinToCode(prefix = "[", suffix = "]") + .joinToCode(prefix = "[", suffix = "]"), ) .useSiteTarget(useSiteTarget) .build() @@ -202,11 +202,11 @@ internal object ClassInspectorUtil { // Nested A: package/of/class/MyClass.NestedClass val simpleName = kotlinMetadataName.substringAfterLast( '/', // Drop the package name, e.g. "package/of/class/" - '.' // Drop any enclosing classes, e.g. "MyClass." + '.', // Drop any enclosing classes, e.g. "MyClass." ) val packageName = kotlinMetadataName.substringBeforeLast( delimiter = "/", - missingDelimiterValue = "" + missingDelimiterValue = "", ) val simpleNames = kotlinMetadataName.removeSuffix(simpleName) .removeSuffix(".") // Trailing "." if any @@ -224,7 +224,7 @@ internal object ClassInspectorUtil { return ClassName( packageName = packageName.replace("/", "."), - simpleNames = simpleNames + simpleNames = simpleNames, ) } diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ElementsClassInspector.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ElementsClassInspector.kt index 9a3a9a28..d4f77860 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ElementsClassInspector.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ElementsClassInspector.kt @@ -93,7 +93,7 @@ private typealias ElementsModifier = javax.lang.model.element.Modifier @KotlinPoetMetadataPreview public class ElementsClassInspector private constructor( private val elements: Elements, - private val types: Types + private val types: Types, ) : ClassInspector { private val typeElementCache = ConcurrentHashMap<ClassName, Optional<TypeElement>>() private val methodCache = ConcurrentHashMap<Pair<TypeElement, String>, Optional<ExecutableElement>>() @@ -140,14 +140,14 @@ public class ElementsClassInspector private constructor( private fun lookupMethod( className: ClassName, methodSignature: JvmMethodSignature, - elementFilter: (Iterable<Element>) -> List<ExecutableElement> + elementFilter: (Iterable<Element>) -> List<ExecutableElement>, ): ExecutableElement? { return lookupTypeElement(className)?.lookupMethod(methodSignature, elementFilter) } private fun TypeElement.lookupMethod( methodSignature: JvmMethodSignature, - elementFilter: (Iterable<Element>) -> List<ExecutableElement> + elementFilter: (Iterable<Element>) -> List<ExecutableElement>, ): ExecutableElement? { val signatureString = methodSignature.asString() return methodCache.getOrPut(this to signatureString) { @@ -170,7 +170,7 @@ public class ElementsClassInspector private constructor( private fun VariableElement.annotationSpecs(): List<AnnotationSpec> { @Suppress("DEPRECATION") return filterOutNullabilityAnnotations( - annotationMirrors.map { AnnotationSpec.get(it) } + annotationMirrors.map { AnnotationSpec.get(it) }, ) } @@ -188,7 +188,7 @@ public class ElementsClassInspector private constructor( private fun ExecutableElement.annotationSpecs(): List<AnnotationSpec> { @Suppress("DEPRECATION") return filterOutNullabilityAnnotations( - annotationMirrors.map { AnnotationSpec.get(it) } + annotationMirrors.map { AnnotationSpec.get(it) }, ) } @@ -215,7 +215,7 @@ public class ElementsClassInspector private constructor( return EnumEntryData( declarationContainer = declarationContainer, - annotations = entry.annotationSpecs() + annotations = entry.annotationSpecs(), ) } @@ -270,7 +270,7 @@ public class ElementsClassInspector private constructor( */ private fun TypeElement.getAllMethods( pkg: PackageElement, - methodsAccumulator: SetMultimap<String, ExecutableElement> + methodsAccumulator: SetMultimap<String, ExecutableElement>, ) { for (superInterface in interfaces) { MoreTypes.asTypeElement(superInterface).getAllMethods(pkg, methodsAccumulator) @@ -306,7 +306,7 @@ public class ElementsClassInspector private constructor( override fun containerData( declarationContainer: KmDeclarationContainer, className: ClassName, - parentClassName: ClassName? + parentClassName: ClassName?, ): ContainerData { val typeElement: TypeElement = lookupTypeElement(className) ?: error("No class found for: $className.") val isCompanionObject = when (declarationContainer) { @@ -340,7 +340,7 @@ public class ElementsClassInspector private constructor( isCompanionObject = isCompanionObject, hasGetter = property.getterSignature != null, hasSetter = property.setterSignature != null, - hasField = property.fieldSignature != null + hasField = property.fieldSignature != null, ) val fieldData = property.fieldSignature?.let fieldDataLet@{ fieldSignature -> @@ -387,7 +387,7 @@ public class ElementsClassInspector private constructor( // JvmField companion objects don't need JvmStatic, it's implicit isCompanionObject && isJvmField && it == JvmFieldModifier.STATIC }, - constant = constant + constant = constant, ) } @@ -398,7 +398,7 @@ public class ElementsClassInspector private constructor( hasAnnotations = property.getterFlags.hasAnnotations, jvmInformationMethod = classIfCompanion.takeIf { it != typeElement } ?.lookupMethod(getterSignature, ElementFilter::methodsIn) - ?: method + ?: method, ) ?: return@let MethodData.SYNTHETIC } @@ -411,7 +411,7 @@ public class ElementsClassInspector private constructor( jvmInformationMethod = classIfCompanion.takeIf { it != typeElement } ?.lookupMethod(setterSignature, ElementFilter::methodsIn) ?: method, - knownIsOverride = getterData?.isOverride + knownIsOverride = getterData?.isOverride, ) ?: return@let MethodData.SYNTHETIC } @@ -435,10 +435,10 @@ public class ElementsClassInspector private constructor( if (isCompanionObject && JvmFieldModifier.STATIC in modifiers) { finalFieldData = fieldData.copy( jvmModifiers = fieldData.jvmModifiers - .filterNotTo(LinkedHashSet()) { it == JvmFieldModifier.STATIC } + .filterNotTo(LinkedHashSet()) { it == JvmFieldModifier.STATIC }, ) annotations += AnnotationSpec.builder( - JVM_STATIC + JVM_STATIC, ).build() } } @@ -448,7 +448,7 @@ public class ElementsClassInspector private constructor( fieldData = finalFieldData, getterData = getterData, setterData = setterData, - isJvmField = isJvmField + isJvmField = isJvmField, ) } @@ -462,7 +462,7 @@ public class ElementsClassInspector private constructor( hasAnnotations = kmFunction.flags.hasAnnotations, jvmInformationMethod = classIfCompanion.takeIf { it != typeElement } ?.lookupMethod(signature, ElementFilter::methodsIn) - ?: method + ?: method, ) ?: return@associateWithTo MethodData.SYNTHETIC } else { @@ -496,7 +496,7 @@ public class ElementsClassInspector private constructor( parameterAnnotations = constructor.parameters.indexedAnnotationSpecs(), isSynthetic = false, jvmModifiers = constructor.jvmModifiers(), - exceptions = constructor.exceptionTypeNames() + exceptions = constructor.exceptionTypeNames(), ) } else { ConstructorData.EMPTY @@ -515,7 +515,7 @@ public class ElementsClassInspector private constructor( }, properties = propertyData, constructors = constructorData, - methods = methodData + methods = methodData, ) } is KmPackage -> { @@ -534,7 +534,7 @@ public class ElementsClassInspector private constructor( } @Suppress("DEPRECATION") AnnotationSpec.get(it) - } + }, ) } return FileData( @@ -543,7 +543,7 @@ public class ElementsClassInspector private constructor( properties = propertyData, methods = methodData, className = className, - jvmName = jvmName + jvmName = jvmName, ) } else -> TODO("Not implemented yet: ${declarationContainer.javaClass.simpleName}") @@ -560,7 +560,7 @@ public class ElementsClassInspector private constructor( typeElement: TypeElement, hasAnnotations: Boolean, jvmInformationMethod: ExecutableElement = this, - knownIsOverride: Boolean? = null + knownIsOverride: Boolean? = null, ): MethodData { return MethodData( annotations = if (hasAnnotations) annotationSpecs() else emptyList(), @@ -568,7 +568,7 @@ public class ElementsClassInspector private constructor( isSynthetic = false, jvmModifiers = jvmInformationMethod.jvmModifiers(), isOverride = knownIsOverride ?: isOverriddenIn(typeElement), - exceptions = exceptionTypeNames() + exceptions = exceptionTypeNames(), ) } diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/JvmDescriptorUtils.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/JvmDescriptorUtils.kt index 41717abc..235e5e87 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/JvmDescriptorUtils.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/JvmDescriptorUtils.kt @@ -182,10 +182,12 @@ internal object JvmDescriptorTypeVisitor : AbstractTypeVisitor6<String, Types>() override fun visitTypeVariable(t: TypeVariable, types: Types): String = t.descriptor(types) override fun visitNull(t: NullType, types: Types): String = visitUnknown( - t, types + t, + types, ) override fun visitError(t: ErrorType, types: Types): String = visitUnknown( - t, types + t, + types, ) override fun visitUnknown(t: TypeMirror, types: Types): String = error("Unsupported type $t") diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/Optional.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/Optional.kt index 09c3e6fd..41935e36 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/Optional.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/Optional.kt @@ -21,5 +21,5 @@ package com.squareup.kotlinpoet.metadata.classinspectors internal data class Optional<out T : Any>(val nullableValue: T?) internal fun <T : Any> T?.toOptional(): Optional<T> = Optional( - this + this, ) diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ReflectiveClassInspector.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ReflectiveClassInspector.kt index 03c75913..fc31ba09 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ReflectiveClassInspector.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ReflectiveClassInspector.kt @@ -75,7 +75,7 @@ import kotlinx.metadata.jvm.syntheticMethodForAnnotations @KotlinPoetMetadataPreview public class ReflectiveClassInspector private constructor( - private val classLoader: ClassLoader? + private val classLoader: ClassLoader?, ) : ClassInspector { private val classCache = ConcurrentHashMap<ClassName, Optional<Class<*>>>() @@ -134,7 +134,7 @@ public class ReflectiveClassInspector private constructor( } private fun Class<*>.lookupMethod( - methodSignature: JvmMethodSignature + methodSignature: JvmMethodSignature, ): Method? { val signatureString = methodSignature.asString() return methodCache.getOrPut(this to signatureString) { @@ -146,7 +146,7 @@ public class ReflectiveClassInspector private constructor( } private fun Class<*>.lookupConstructor( - constructorSignature: JvmMethodSignature + constructorSignature: JvmMethodSignature, ): Constructor<*>? { val signatureString = constructorSignature.asString() return constructorCache.getOrPut(this to signatureString) { @@ -173,13 +173,13 @@ public class ReflectiveClassInspector private constructor( private fun Field.annotationSpecs(): List<AnnotationSpec> { return filterOutNullabilityAnnotations( - declaredAnnotations.orEmpty().map { AnnotationSpec.get(it, includeDefaultValues = true) } + declaredAnnotations.orEmpty().map { AnnotationSpec.get(it, includeDefaultValues = true) }, ) } private fun Constructor<*>.annotationSpecs(): List<AnnotationSpec> { return filterOutNullabilityAnnotations( - declaredAnnotations.orEmpty().map { AnnotationSpec.get(it, true) } + declaredAnnotations.orEmpty().map { AnnotationSpec.get(it, true) }, ) } @@ -207,13 +207,13 @@ public class ReflectiveClassInspector private constructor( private fun Method.annotationSpecs(): List<AnnotationSpec> { return filterOutNullabilityAnnotations( - declaredAnnotations.orEmpty().map { AnnotationSpec.get(it, includeDefaultValues = true) } + declaredAnnotations.orEmpty().map { AnnotationSpec.get(it, includeDefaultValues = true) }, ) } private fun Parameter.annotationSpecs(): List<AnnotationSpec> { return filterOutNullabilityAnnotations( - declaredAnnotations.map { AnnotationSpec.get(it, includeDefaultValues = true) } + declaredAnnotations.map { AnnotationSpec.get(it, includeDefaultValues = true) }, ) } @@ -249,7 +249,7 @@ public class ReflectiveClassInspector private constructor( } else { enumEntry.javaClass.getAnnotation(Metadata::class.java)?.toKmClass() }, - annotations = clazz.getField(enumEntry.name).annotationSpecs() + annotations = clazz.getField(enumEntry.name).annotationSpecs(), ) } @@ -288,7 +288,7 @@ public class ReflectiveClassInspector private constructor( override fun containerData( declarationContainer: KmDeclarationContainer, className: ClassName, - parentClassName: ClassName? + parentClassName: ClassName?, ): ContainerData { val targetClass = lookupClass(className) ?: error("No class found for: $className.") val isCompanionObject: Boolean = when (declarationContainer) { @@ -322,7 +322,7 @@ public class ReflectiveClassInspector private constructor( isCompanionObject = isCompanionObject, hasGetter = property.getterSignature != null, hasSetter = property.setterSignature != null, - hasField = property.fieldSignature != null + hasField = property.fieldSignature != null, ) val fieldData = property.fieldSignature?.let { fieldSignature -> @@ -378,7 +378,7 @@ public class ReflectiveClassInspector private constructor( // JvmField companion objects don't need JvmStatic, it's implicit isCompanionObject && isJvmField && it == JvmFieldModifier.STATIC }, - constant = constant + constant = constant, ) } @@ -389,7 +389,7 @@ public class ReflectiveClassInspector private constructor( signature = getterSignature, hasAnnotations = property.getterFlags.hasAnnotations, jvmInformationMethod = classIfCompanion.takeIf { it != targetClass } - ?.lookupMethod(getterSignature) ?: method + ?.lookupMethod(getterSignature) ?: method, ) ?: error("No getter method $getterSignature found in $classIfCompanion.") } @@ -402,7 +402,7 @@ public class ReflectiveClassInspector private constructor( hasAnnotations = property.setterFlags.hasAnnotations, jvmInformationMethod = classIfCompanion.takeIf { it != targetClass } ?.lookupMethod(setterSignature) ?: method, - knownIsOverride = getterData?.isOverride + knownIsOverride = getterData?.isOverride, ) ?: error("No setter method $setterSignature found in $classIfCompanion.") } @@ -423,7 +423,7 @@ public class ReflectiveClassInspector private constructor( fieldData = fieldData, getterData = getterData, setterData = setterData, - isJvmField = isJvmField + isJvmField = isJvmField, ) } @@ -437,7 +437,7 @@ public class ReflectiveClassInspector private constructor( signature = signature, hasAnnotations = kmFunction.flags.hasAnnotations, jvmInformationMethod = classIfCompanion.takeIf { it != targetClass }?.lookupMethod(signature) - ?: method + ?: method, ) ?: error("No method $signature found in $targetClass.") } else { @@ -478,7 +478,7 @@ public class ReflectiveClassInspector private constructor( parameterAnnotations = constructor.parameters.indexedAnnotationSpecs(), isSynthetic = constructor.isSynthetic, jvmModifiers = constructor.jvmModifiers(), - exceptions = constructor.exceptionTypeNames() + exceptions = constructor.exceptionTypeNames(), ) } else { ConstructorData.EMPTY @@ -490,7 +490,7 @@ public class ReflectiveClassInspector private constructor( annotations = classAnnotations, properties = propertyData, constructors = constructorData, - methods = methodData + methods = methodData, ) } is KmPackage -> { @@ -507,7 +507,7 @@ public class ReflectiveClassInspector private constructor( annotations = fileAnnotations, properties = propertyData, methods = methodData, - className = className + className = className, ) } else -> TODO("Not implemented yet: ${declarationContainer.javaClass.simpleName}") @@ -525,7 +525,7 @@ public class ReflectiveClassInspector private constructor( signature: JvmMethodSignature, hasAnnotations: Boolean, jvmInformationMethod: Method = this, - knownIsOverride: Boolean? = null + knownIsOverride: Boolean? = null, ): MethodData { return MethodData( annotations = if (hasAnnotations) annotationSpecs() else emptyList(), @@ -533,7 +533,7 @@ public class ReflectiveClassInspector private constructor( isSynthetic = isSynthetic, jvmModifiers = jvmInformationMethod.jvmModifiers(), isOverride = knownIsOverride ?: signature.isOverriddenIn(clazz), - exceptions = exceptionTypeNames() + exceptions = exceptionTypeNames(), ) } @@ -568,7 +568,7 @@ public class ReflectiveClassInspector private constructor( get() = parameterTypes.joinToString( separator = "", prefix = "(", - postfix = ")${returnType.descriptor}" + postfix = ")${returnType.descriptor}", ) { it.descriptor } /** diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ClassInspector.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ClassInspector.kt index c5d3ab3a..14c019fd 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ClassInspector.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ClassInspector.kt @@ -43,7 +43,7 @@ public interface ClassInspector { public fun containerData( declarationContainer: KmDeclarationContainer, className: ClassName, - parentClassName: ClassName? + parentClassName: ClassName?, ): ContainerData /** @@ -94,7 +94,7 @@ public interface ClassInspector { @KotlinPoetMetadataPreview public fun ClassInspector.containerData( className: ClassName, - parentClassName: ClassName? + parentClassName: ClassName?, ): ContainerData { return containerData(declarationContainerFor(className), className, parentClassName) } diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ConstructorData.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ConstructorData.kt index 63123ece..01c98390 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ConstructorData.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ConstructorData.kt @@ -36,7 +36,7 @@ public data class ConstructorData( val parameterAnnotations: Map<Int, Collection<AnnotationSpec>>, val isSynthetic: Boolean, val jvmModifiers: Set<JvmMethodModifier>, - val exceptions: List<TypeName> + val exceptions: List<TypeName>, ) { /** @@ -61,7 +61,7 @@ public data class ConstructorData( parameterAnnotations = emptyMap(), isSynthetic = false, jvmModifiers = emptySet(), - exceptions = emptyList() + exceptions = emptyList(), ) } } diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ContainerData.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ContainerData.kt index bece1a8b..f1006d01 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ContainerData.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/ContainerData.kt @@ -60,7 +60,7 @@ public data class ClassData( override val annotations: Collection<AnnotationSpec>, override val properties: Map<KmProperty, PropertyData>, val constructors: Map<KmConstructor, ConstructorData>, - override val methods: Map<KmFunction, MethodData> + override val methods: Map<KmFunction, MethodData>, ) : ContainerData /** @@ -80,7 +80,7 @@ public data class FileData( override val methods: Map<KmFunction, MethodData>, val className: ClassName, val jvmName: String? = - if (!className.simpleName.endsWith("Kt")) className.simpleName else null + if (!className.simpleName.endsWith("Kt")) className.simpleName else null, ) : ContainerData { /** @@ -100,5 +100,5 @@ public data class FileData( @KotlinPoetMetadataPreview public data class EnumEntryData( val declarationContainer: KmClass?, - val annotations: Collection<AnnotationSpec> + val annotations: Collection<AnnotationSpec>, ) diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/FieldData.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/FieldData.kt index bcb9ef54..a000ddef 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/FieldData.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/FieldData.kt @@ -36,7 +36,7 @@ public data class FieldData( private val annotations: List<AnnotationSpec>, val isSynthetic: Boolean, val jvmModifiers: Set<JvmFieldModifier>, - val constant: CodeBlock? + val constant: CodeBlock?, ) { /** @@ -44,7 +44,7 @@ public data class FieldData( * and [isSynthetic]. */ val allAnnotations: Collection<AnnotationSpec> = ClassInspectorUtil.createAnnotations( - FIELD + FIELD, ) { addAll(annotations) if (isSynthetic) { @@ -58,7 +58,7 @@ public data class FieldData( annotations = emptyList(), isSynthetic = true, jvmModifiers = emptySet(), - constant = null + constant = null, ) } } diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/JvmFieldModifier.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/JvmFieldModifier.kt index c749e8de..37792208 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/JvmFieldModifier.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/JvmFieldModifier.kt @@ -24,17 +24,17 @@ import com.squareup.kotlinpoet.metadata.KotlinPoetMetadataPreview public enum class JvmFieldModifier : JvmModifier { STATIC { override fun annotationSpec(): AnnotationSpec = AnnotationSpec.builder( - JvmStatic::class.asClassName() + JvmStatic::class.asClassName(), ).build() }, TRANSIENT { override fun annotationSpec(): AnnotationSpec = AnnotationSpec.builder( - Transient::class.asClassName() + Transient::class.asClassName(), ).build() }, VOLATILE { override fun annotationSpec(): AnnotationSpec = AnnotationSpec.builder( - Volatile::class.asClassName() + Volatile::class.asClassName(), ).build() }; } diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/JvmMethodModifier.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/JvmMethodModifier.kt index 71a74945..e9e2fe38 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/JvmMethodModifier.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/JvmMethodModifier.kt @@ -24,12 +24,12 @@ import com.squareup.kotlinpoet.metadata.KotlinPoetMetadataPreview public enum class JvmMethodModifier : JvmModifier { STATIC { override fun annotationSpec(): AnnotationSpec = AnnotationSpec.builder( - JvmStatic::class.asClassName() + JvmStatic::class.asClassName(), ).build() }, SYNCHRONIZED { override fun annotationSpec(): AnnotationSpec = AnnotationSpec.builder( - Synchronized::class.asClassName() + Synchronized::class.asClassName(), ).build() }, DEFAULT diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/kmTypes.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/KmTypes.kt index c556b830..cd12479c 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/kmTypes.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/KmTypes.kt @@ -73,7 +73,7 @@ internal fun KmVariance.toKModifier(): KModifier? { @KotlinPoetMetadataPreview internal fun KmTypeProjection.toTypeName( - typeParamResolver: TypeParameterResolver + typeParamResolver: TypeParameterResolver, ): TypeName { val typename = type?.toTypeName(typeParamResolver) ?: STAR return when (variance) { @@ -91,7 +91,7 @@ internal fun KmTypeProjection.toTypeName( */ @KotlinPoetMetadataPreview internal fun KmType.toTypeName( - typeParamResolver: TypeParameterResolver + typeParamResolver: TypeParameterResolver, ): TypeName { val argumentList = arguments.map { it.toTypeName(typeParamResolver) } val type: TypeName = when (val valClassifier = classifier) { @@ -125,13 +125,13 @@ internal fun KmType.toTypeName( LambdaTypeName.get( receiver = parameters[0], parameters = parameters.drop(1).toTypedArray(), - returnType = returnType + returnType = returnType, ) } else { LambdaTypeName.get( receiver = null, parameters = parameters, - returnType = returnType + returnType = returnType, ) } lambdaType.copy(suspending = isSuspend) @@ -159,20 +159,20 @@ internal fun KmType.toTypeName( // type in tags for reference. val abbreviatedTypeName = it.toTypeName(typeParamResolver) abbreviatedTypeName.copy( - tags = mapOf(TypeAliasTag::class to TypeAliasTag(finalType)) + tags = mapOf(TypeAliasTag::class to TypeAliasTag(finalType)), ) } ?: finalType } @KotlinPoetMetadataPreview internal fun KmTypeParameter.toTypeVariableName( - typeParamResolver: TypeParameterResolver + typeParamResolver: TypeParameterResolver, ): TypeVariableName { val finalVariance = variance.toKModifier() val typeVariableName = TypeVariableName( name = name, bounds = upperBounds.map { it.toTypeName(typeParamResolver) }, - variance = finalVariance + variance = finalVariance, ) val annotations = ClassInspectorUtil.createAnnotations { for (annotation in annotations) { @@ -182,13 +182,13 @@ internal fun KmTypeParameter.toTypeVariableName( return typeVariableName.copy( reified = isReified, tags = mapOf(KmTypeParameter::class to this), - annotations = annotations + annotations = annotations, ) } @KotlinPoetMetadataPreview private fun KmFlexibleTypeUpperBound.toTypeName( - typeParamResolver: TypeParameterResolver + typeParamResolver: TypeParameterResolver, ): TypeName { // TODO tag typeFlexibilityId somehow? return WildcardTypeName.producerOf(type.toTypeName(typeParamResolver)) @@ -209,7 +209,7 @@ internal interface TypeParameterResolver { @KotlinPoetMetadataPreview internal fun List<KmTypeParameter>.toTypeParameterResolver( - fallback: TypeParameterResolver? = null + fallback: TypeParameterResolver? = null, ): TypeParameterResolver { val parametersMap = LinkedHashMap<Int, TypeVariableName>() val typeParamResolver = { id: Int -> diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/KotlinPoetMetadataSpecs.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/KotlinPoetMetadataSpecs.kt index 37163e55..1f9e1af2 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/KotlinPoetMetadataSpecs.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/KotlinPoetMetadataSpecs.kt @@ -136,48 +136,48 @@ import kotlinx.metadata.jvm.signature /** @return a [TypeSpec] ABI representation of this [KClass]. */ @KotlinPoetMetadataPreview public fun KClass<*>.toTypeSpec( - classInspector: ClassInspector? = null + classInspector: ClassInspector? = null, ): TypeSpec = java.toTypeSpec(classInspector) /** @return a [TypeSpec] ABI representation of this [KClass]. */ @KotlinPoetMetadataPreview public fun Class<*>.toTypeSpec( - classInspector: ClassInspector? = null + classInspector: ClassInspector? = null, ): TypeSpec = toKmClass().toTypeSpec(classInspector, asClassName()) /** @return a [TypeSpec] ABI representation of this [TypeElement]. */ @Suppress("DEPRECATION") @KotlinPoetMetadataPreview public fun TypeElement.toTypeSpec( - classInspector: ClassInspector? = null + classInspector: ClassInspector? = null, ): TypeSpec = toKmClass().toTypeSpec(classInspector, asClassName()) /** @return a [FileSpec] ABI representation of this [KClass]. */ @KotlinPoetMetadataPreview public fun KClass<*>.toFileSpec( - classInspector: ClassInspector? = null + classInspector: ClassInspector? = null, ): FileSpec = java.toFileSpec(classInspector) /** @return a [FileSpec] ABI representation of this [KClass]. */ @KotlinPoetMetadataPreview public fun Class<*>.toFileSpec( - classInspector: ClassInspector? = null + classInspector: ClassInspector? = null, ): FileSpec = FileSpec.get(`package`.name, toTypeSpec(classInspector)) /** @return a [FileSpec] ABI representation of this [TypeElement]. */ @KotlinPoetMetadataPreview public fun TypeElement.toFileSpec( - classInspector: ClassInspector? = null + classInspector: ClassInspector? = null, ): FileSpec = FileSpec.get( packageName = packageName, - typeSpec = toTypeSpec(classInspector) + typeSpec = toTypeSpec(classInspector), ) /** @return a [TypeSpec] ABI representation of this [KmClass]. */ @KotlinPoetMetadataPreview public fun KmClass.toTypeSpec( classInspector: ClassInspector?, - className: ClassName = createClassName(name) + className: ClassName = createClassName(name), ): TypeSpec { return toTypeSpec(classInspector, className, null) } @@ -186,11 +186,11 @@ public fun KmClass.toTypeSpec( @KotlinPoetMetadataPreview public fun KmClass.toFileSpec( classInspector: ClassInspector?, - className: ClassName = createClassName(name) + className: ClassName = createClassName(name), ): FileSpec { return FileSpec.get( packageName = className.packageName, - typeSpec = toTypeSpec(classInspector, className) + typeSpec = toTypeSpec(classInspector, className), ) } @@ -198,7 +198,7 @@ public fun KmClass.toFileSpec( @KotlinPoetMetadataPreview public fun KmPackage.toFileSpec( classInspector: ClassInspector?, - className: ClassName + className: ClassName, ): FileSpec { val fileData = classInspector?.containerData(className, null) check(fileData is FileData?) { @@ -212,7 +212,7 @@ public fun KmPackage.toFileSpec( addAnnotation( AnnotationSpec.builder(ClassInspectorUtil.JVM_NAME) .addMember("name = %S", name) - .build() + .build(), ) } val fileAnnotations = createAnnotations(FILE) { @@ -229,8 +229,8 @@ public fun KmPackage.toFileSpec( classInspector = classInspector, containerData = fileData, methodData = methodData, - isInInterface = false - ) + isInInterface = false, + ), ) } for (property in properties) { @@ -240,8 +240,8 @@ public fun KmPackage.toFileSpec( classInspector = classInspector, containerData = fileData, propertyData = propertyData, - isInInterface = false - ) + isInInterface = false, + ), ) } for (alias in typeAliases) { @@ -257,7 +257,7 @@ private const val NOT_IMPLEMENTED = "throw·NotImplementedError(\"Stub!\")" private fun KmClass.toTypeSpec( classInspector: ClassInspector?, className: ClassName, - parentClassName: ClassName? + parentClassName: ClassName?, ): TypeSpec { val classTypeParamsResolver = typeParameters.toTypeParameterResolver() val jvmInternalName = name.jvmInternalName @@ -305,7 +305,7 @@ private fun KmClass.toTypeSpec( } else { TypeSpec.anonymousClassBuilder() .addKdoc( - "No ClassInspector was available during metadata parsing, so this entry may not be reflected accurately if it has a class body." + "No ClassInspector was available during metadata parsing, so this entry may not be reflected accurately if it has a class body.", ) .build() } @@ -319,7 +319,7 @@ private fun KmClass.toTypeSpec( *flags.modalities .filterNot { it == FINAL } // Default .filterNot { isInterface && it == ABSTRACT } // Abstract is a default on interfaces - .toTypedArray() + .toTypedArray(), ) if (isData) { builder.addModifiers(DATA) @@ -355,7 +355,7 @@ private fun KmClass.toTypeSpec( .filterNot { it == superClass } .map { it.toTypeName(classTypeParamsResolver) } .filterNot { it == ANY } - .asIterable() + .asIterable(), ) val primaryConstructorParams = mutableMapOf<String, ParameterSpec>() if (isClass || isAnnotation || isEnum) { @@ -378,7 +378,7 @@ private fun KmClass.toTypeSpec( } .map { (kmConstructor, constructorData) -> kmConstructor.toFunSpec(classTypeParamsResolver, constructorData) - } + }, ) } } @@ -394,10 +394,10 @@ private fun KmClass.toTypeSpec( isConstructorParam = property.name in primaryConstructorParams, classInspector = classInspector, containerData = classData, - propertyData = propertyData + propertyData = propertyData, ) } - .asIterable() + .asIterable(), ) companionObject?.let { objectName -> val companionType = if (classInspector != null) { @@ -407,7 +407,7 @@ private fun KmClass.toTypeSpec( } else { TypeSpec.companionObjectBuilder(companionObjectName(objectName)) .addKdoc( - "No ClassInspector was available during metadata parsing, so this companion object's API/contents may not be reflected accurately." + "No ClassInspector was available during metadata parsing, so this companion object's API/contents may not be reflected accurately.", ) .build() } @@ -433,8 +433,8 @@ private fun KmClass.toTypeSpec( return handler.methodExists( className.nestedClass("DefaultImpls"), signature.copy( - desc = "(L$jvmInternalName;$suffix" - ) + desc = "(L$jvmInternalName;$suffix", + ), ) } } @@ -456,13 +456,13 @@ private fun KmClass.toTypeSpec( if (methodData?.isSynthetic == true) { addKdoc( "Note: Since this is a synthetic function, some JVM information " + - "(annotations, modifiers) may be missing." + "(annotations, modifiers) may be missing.", ) } } .build() } - .asIterable() + .asIterable(), ) for (it in nestedClasses) { @@ -478,7 +478,7 @@ private fun KmClass.toTypeSpec( } else { TypeSpec.classBuilder(it) .addKdoc( - "No ClassInspector was available during metadata parsing, so this nested class's API/contents may not be reflected accurately." + "No ClassInspector was available during metadata parsing, so this nested class's API/contents may not be reflected accurately.", ) .build() } @@ -497,7 +497,7 @@ private fun companionObjectName(name: String): String? { @KotlinPoetMetadataPreview private fun KmConstructor.toFunSpec( typeParamResolver: TypeParameterResolver, - constructorData: ConstructorData? + constructorData: ConstructorData?, ): FunSpec { return FunSpec.constructorBuilder() .apply { @@ -510,9 +510,9 @@ private fun KmConstructor.toFunSpec( constructorData?.takeIf { it != ConstructorData.EMPTY } ?.parameterAnnotations ?.get(index) - .orEmpty() + .orEmpty(), ) - } + }, ) if (!isPrimary) { // TODO How do we know when to add callSuperConstructor()? @@ -535,10 +535,10 @@ private fun KmFunction.toFunSpec( classInspector: ClassInspector? = null, containerData: ContainerData? = null, methodData: MethodData? = null, - isInInterface: Boolean = containerData?.isInterface ?: false + isInInterface: Boolean = containerData?.isInterface ?: false, ): FunSpec { val typeParamsResolver = typeParameters.toTypeParameterResolver( - fallback = classTypeParamsResolver + fallback = classTypeParamsResolver, ) val mutableAnnotations = mutableListOf<AnnotationSpec>() if (classInspector != null && containerData != null) { @@ -567,7 +567,7 @@ private fun KmFunction.toFunSpec( flags.modalities .filterNot { it == FINAL && !isOverride } // Final is the default .filterNot { it == OPEN && isOverride } // Overrides are implicitly open - .filterNot { it == OPEN && isInInterface } // interface methods are implicitly open + .filterNot { it == OPEN && isInInterface }, // interface methods are implicitly open ) if (valueParameters.isNotEmpty()) { addParameters( @@ -575,9 +575,9 @@ private fun KmFunction.toFunSpec( param.toParameterSpec( typeParamsResolver, // This can be empty if the element is synthetic - methodData?.parameterAnnotations?.get(index).orEmpty() + methodData?.parameterAnnotations?.get(index).orEmpty(), ) - } + }, ) } if (typeParameters.isNotEmpty()) { @@ -623,7 +623,7 @@ private fun KmFunction.toFunSpec( @KotlinPoetMetadataPreview private fun KmValueParameter.toParameterSpec( typeParamResolver: TypeParameterResolver, - annotations: Collection<AnnotationSpec> + annotations: Collection<AnnotationSpec>, ): ParameterSpec { val paramType = varargElementType ?: type ?: throw IllegalStateException("No argument type!") return ParameterSpec.builder(name, paramType.toTypeName(typeParamResolver)) @@ -653,7 +653,7 @@ private fun KmProperty.toPropertySpec( classInspector: ClassInspector? = null, containerData: ContainerData? = null, propertyData: PropertyData? = null, - isInInterface: Boolean = containerData?.isInterface ?: false + isInInterface: Boolean = containerData?.isInterface ?: false, ): PropertySpec { val isOverride = propertyData?.isOverride ?: false val returnTypeName = returnType.toTypeName(typeParamResolver) @@ -679,7 +679,7 @@ private fun KmProperty.toPropertySpec( } getterSignature.jvmNameAnnotation( metadataName = expectedMetadataName, - useSiteTarget = UseSiteTarget.GET + useSiteTarget = UseSiteTarget.GET, )?.let { jvmNameAnnotation -> mutableAnnotations += jvmNameAnnotation } @@ -700,7 +700,7 @@ private fun KmProperty.toPropertySpec( // We skip interface types or open/abstract properties because they can't have @JvmName. setterSignature.jvmNameAnnotation( metadataName = "set${name.safeCapitalize(Locale.US)}", - useSiteTarget = UseSiteTarget.SET + useSiteTarget = UseSiteTarget.SET, )?.let { jvmNameAnnotation -> mutableAnnotations += jvmNameAnnotation } @@ -736,7 +736,7 @@ private fun KmProperty.toPropertySpec( .filterNot { it == FINAL && !isOverride } // Final is the default .filterNot { it == OPEN && isOverride } // Overrides are implicitly open .filterNot { it == OPEN && isInInterface } // Interface properties implicitly open - .filterNot { it == ABSTRACT && isInInterface } // Interface properties implicitly abstract + .filterNot { it == ABSTRACT && isInInterface }, // Interface properties implicitly abstract ) if (isOverride) { addModifiers(KModifier.OVERRIDE) @@ -758,7 +758,7 @@ private fun KmProperty.toPropertySpec( if (returnTypeName.isNullable) { delegate( "%T.observable(null) { _, _, _ -> }", - ClassName("kotlin.properties", "Delegates") + ClassName("kotlin.properties", "Delegates"), ) } else { delegate("%T.notNull()", ClassName("kotlin.properties", "Delegates")) // Placeholder @@ -792,8 +792,10 @@ private fun KmProperty.toPropertySpec( val modifierSet = modifiers.toSet() if (hasGetter && !isDelegated && !flags.isAbstract) { propertyAccessor( - modifierSet, getterFlags, - FunSpec.getterBuilder().addStatement(NOT_IMPLEMENTED), isOverride + modifierSet, + getterFlags, + FunSpec.getterBuilder().addStatement(NOT_IMPLEMENTED), + isOverride, )?.let(::getter) } if (hasSetter && !isDelegated && !flags.isAbstract) { @@ -809,7 +811,7 @@ private fun propertyAccessor( propertyModifiers: Set<KModifier>, flags: Flags, functionBuilder: Builder, - isOverride: Boolean + isOverride: Boolean, ): FunSpec? { val visibility = flags.visibility if (visibility == PUBLIC || visibility !in propertyModifiers) { @@ -864,7 +866,7 @@ private fun KmTypeAlias.toTypeAliasSpec(): TypeAliasSpec { private fun JvmMethodSignature.jvmNameAnnotation( metadataName: String, - useSiteTarget: UseSiteTarget? = null + useSiteTarget: UseSiteTarget? = null, ): AnnotationSpec? { return if (name == metadataName) { null @@ -878,7 +880,7 @@ private fun JvmMethodSignature.jvmNameAnnotation( private val JAVA_ANNOTATION_ANNOTATIONS = setOf( java.lang.annotation.Retention::class.asClassName(), - java.lang.annotation.Target::class.asClassName() + java.lang.annotation.Target::class.asClassName(), ) @KotlinPoetMetadataPreview @@ -928,6 +930,7 @@ private inline fun <E> setOf(body: MutableSet<E>.() -> Unit): Set<E> { } private val METADATA = Metadata::class.asClassName() + @Suppress("DEPRECATION") private val JVM_DEFAULT = JvmDefault::class.asClassName() private val JVM_STATIC = JvmStatic::class.asClassName() diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/MethodData.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/MethodData.kt index 81957a6d..7319e9d8 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/MethodData.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/MethodData.kt @@ -39,7 +39,7 @@ public data class MethodData( val isSynthetic: Boolean, val jvmModifiers: Set<JvmMethodModifier>, val isOverride: Boolean, - val exceptions: List<TypeName> + val exceptions: List<TypeName>, ) { /** @@ -53,10 +53,10 @@ public data class MethodData( */ public fun allAnnotations( useSiteTarget: UseSiteTarget? = null, - containsReifiedTypeParameter: Boolean = false + containsReifiedTypeParameter: Boolean = false, ): Collection<AnnotationSpec> { return ClassInspectorUtil.createAnnotations( - useSiteTarget + useSiteTarget, ) { addAll(annotations) if (isSynthetic && !containsReifiedTypeParameter) { @@ -77,7 +77,7 @@ public data class MethodData( isSynthetic = true, jvmModifiers = emptySet(), isOverride = false, - exceptions = emptyList() + exceptions = emptyList(), ) public val EMPTY: MethodData = MethodData( annotations = emptyList(), @@ -85,7 +85,7 @@ public data class MethodData( isSynthetic = false, jvmModifiers = emptySet(), isOverride = false, - exceptions = emptyList() + exceptions = emptyList(), ) } } diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/PropertyData.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/PropertyData.kt index 38ec2b74..9fc6d3e4 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/PropertyData.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/specs/PropertyData.kt @@ -37,7 +37,7 @@ public data class PropertyData( val fieldData: FieldData?, val getterData: MethodData?, val setterData: MethodData?, - val isJvmField: Boolean + val isJvmField: Boolean, ) { /** Indicates if this property overrides another from a supertype. */ val isOverride: Boolean = (getterData?.isOverride ?: false) || (setterData?.isOverride ?: false) @@ -79,7 +79,7 @@ public data class PropertyData( addAll(getterAnnotations.values) addAll( setterData?.allAnnotations(SET).orEmpty() - .filterNot { it.typeName in higherScopedAnnotations } + .filterNot { it.typeName in higherScopedAnnotations }, ) if (isJvmField) { add(ClassInspectorUtil.JVM_FIELD_SPEC) diff --git a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/FacadeFile.kt b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/FacadeFile.kt index f271422e..6eb40a88 100644 --- a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/FacadeFile.kt +++ b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/FacadeFile.kt @@ -38,7 +38,7 @@ fun synchronizedFun() { fun jvmOverloads( param1: String, optionalParam2: String = "", - nullableParam3: String? = null + nullableParam3: String? = null, ) { } diff --git a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/FileFacadeTest.kt b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/FacadeFileTest.kt index 82186ec9..bc91d09d 100644 --- a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/FileFacadeTest.kt +++ b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/FacadeFileTest.kt @@ -27,12 +27,12 @@ class FacadeFileTest : MultiClassInspectorTest() { @IgnoreForHandlerType( handlerType = ELEMENTS, - reason = "Elements can detect JvmOverloads, JvmName not possible in reflection" + reason = "Elements can detect JvmOverloads, JvmName not possible in reflection", ) @Test fun facadeFile_reflective() { val fileSpec = Class.forName( - "com.squareup.kotlinpoet.metadata.specs.FacadeFile" + "com.squareup.kotlinpoet.metadata.specs.FacadeFile", ).kotlin.toFileSpecWithTestHandler() assertThat(fileSpec.name).isEqualTo("FacadeFile") //language=kotlin @@ -157,18 +157,18 @@ class FacadeFileTest : MultiClassInspectorTest() { public typealias FacadeNestedTypeAlias = List<GenericTypeAlias> public typealias FacadeTypeAliasName = String - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( handlerType = REFLECTIVE, - reason = "Elements can detect JvmOverloads, JvmName not possible in reflection" + reason = "Elements can detect JvmOverloads, JvmName not possible in reflection", ) @Test fun facadeFile_elements() { val fileSpec = Class.forName( - "com.squareup.kotlinpoet.metadata.specs.FacadeFile" + "com.squareup.kotlinpoet.metadata.specs.FacadeFile", ).kotlin.toFileSpecWithTestHandler() assertThat(fileSpec.name).isEqualTo("FacadeFile") //language=kotlin @@ -293,18 +293,18 @@ class FacadeFileTest : MultiClassInspectorTest() { public typealias FacadeNestedTypeAlias = List<GenericTypeAlias> public typealias FacadeTypeAliasName = String - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( handlerType = ELEMENTS, - reason = "JvmName not possible in reflection" + reason = "JvmName not possible in reflection", ) @Test fun noJvmName_reflective() { val fileSpec = Class.forName( - "com.squareup.kotlinpoet.metadata.specs.NoJvmNameFacadeFileKt" + "com.squareup.kotlinpoet.metadata.specs.NoJvmNameFacadeFileKt", ).kotlin.toFileSpecWithTestHandler() assertThat(fileSpec.name).isEqualTo("NoJvmNameFacadeFile") //language=kotlin @@ -315,18 +315,18 @@ class FacadeFileTest : MultiClassInspectorTest() { import kotlin.String public val prop: String = "" - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( handlerType = REFLECTIVE, - reason = "JvmName not possible in reflection" + reason = "JvmName not possible in reflection", ) @Test fun noJvmName_elements() { val fileSpec = Class.forName( - "com.squareup.kotlinpoet.metadata.specs.NoJvmNameFacadeFileKt" + "com.squareup.kotlinpoet.metadata.specs.NoJvmNameFacadeFileKt", ).kotlin.toFileSpecWithTestHandler() assertThat(fileSpec.name).isEqualTo("NoJvmNameFacadeFile") //language=kotlin @@ -337,18 +337,18 @@ class FacadeFileTest : MultiClassInspectorTest() { import kotlin.String public val prop: String = throw NotImplementedError("Stub!") - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( handlerType = ELEMENTS, - reason = "JvmName not possible in reflection" + reason = "JvmName not possible in reflection", ) @Test fun jvmName_with_kt_reflective() { val fileSpec = Class.forName( - "com.squareup.kotlinpoet.metadata.specs.JvmNameKt" + "com.squareup.kotlinpoet.metadata.specs.JvmNameKt", ).kotlin.toFileSpecWithTestHandler() assertThat(fileSpec.name).isEqualTo("JvmName") //language=kotlin @@ -359,18 +359,18 @@ class FacadeFileTest : MultiClassInspectorTest() { import kotlin.String public val prop2: String = "" - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( handlerType = REFLECTIVE, - reason = "JvmName not possible in reflection" + reason = "JvmName not possible in reflection", ) @Test fun jvmName_with_kt_elements() { val fileSpec = Class.forName( - "com.squareup.kotlinpoet.metadata.specs.JvmNameKt" + "com.squareup.kotlinpoet.metadata.specs.JvmNameKt", ).kotlin.toFileSpecWithTestHandler() assertThat(fileSpec.name).isEqualTo("JvmName") //language=kotlin @@ -384,7 +384,7 @@ class FacadeFileTest : MultiClassInspectorTest() { import kotlin.jvm.JvmName public val prop2: String = throw NotImplementedError("Stub!") - """.trimIndent() + """.trimIndent(), ) } } diff --git a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/KmAnnotationsTest.kt b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/KmAnnotationsTest.kt index 4d20dc73..c7928b4e 100644 --- a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/KmAnnotationsTest.kt +++ b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/KmAnnotationsTest.kt @@ -46,187 +46,187 @@ class KmAnnotationsTest { assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.NoMembersAnnotation - """.trimIndent() + """.trimIndent(), ) } @Test fun byteValue() { val annotation = KmAnnotation( "test/ByteValueAnnotation", - mapOf("value" to ByteValue(2)) + mapOf("value" to ByteValue(2)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.ByteValueAnnotation(value = 2) - """.trimIndent() + """.trimIndent(), ) } @Test fun charValue() { val annotation = KmAnnotation( "test/CharValueAnnotation", - mapOf("value" to CharValue('2')) + mapOf("value" to CharValue('2')), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.CharValueAnnotation(value = '2') - """.trimIndent() + """.trimIndent(), ) } @Test fun shortValue() { val annotation = KmAnnotation( "test/ShortValueAnnotation", - mapOf("value" to ShortValue(2)) + mapOf("value" to ShortValue(2)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.ShortValueAnnotation(value = 2) - """.trimIndent() + """.trimIndent(), ) } @Test fun intValue() { val annotation = KmAnnotation( "test/IntValueAnnotation", - mapOf("value" to IntValue(2)) + mapOf("value" to IntValue(2)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.IntValueAnnotation(value = 2) - """.trimIndent() + """.trimIndent(), ) } @Test fun longValue() { val annotation = KmAnnotation( "test/LongValueAnnotation", - mapOf("value" to LongValue(2L)) + mapOf("value" to LongValue(2L)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.LongValueAnnotation(value = 2L) - """.trimIndent() + """.trimIndent(), ) } @Test fun floatValue() { val annotation = KmAnnotation( "test/FloatValueAnnotation", - mapOf("value" to FloatValue(2.0F)) + mapOf("value" to FloatValue(2.0F)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.FloatValueAnnotation(value = 2.0F) - """.trimIndent() + """.trimIndent(), ) } @Test fun doubleValue() { val annotation = KmAnnotation( "test/DoubleValueAnnotation", - mapOf("value" to DoubleValue(2.0)) + mapOf("value" to DoubleValue(2.0)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.DoubleValueAnnotation(value = 2.0) - """.trimIndent() + """.trimIndent(), ) } @Test fun booleanValue() { val annotation = KmAnnotation( "test/BooleanValueAnnotation", - mapOf("value" to BooleanValue(true)) + mapOf("value" to BooleanValue(true)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.BooleanValueAnnotation(value = true) - """.trimIndent() + """.trimIndent(), ) } @Test fun uByteValue() { val annotation = KmAnnotation( "test/UByteValueAnnotation", - mapOf("value" to UByteValue(2u)) + mapOf("value" to UByteValue(2u)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.UByteValueAnnotation(value = 2u) - """.trimIndent() + """.trimIndent(), ) } @Test fun uShortValue() { val annotation = KmAnnotation( "test/UShortValueAnnotation", - mapOf("value" to UShortValue(2u)) + mapOf("value" to UShortValue(2u)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.UShortValueAnnotation(value = 2u) - """.trimIndent() + """.trimIndent(), ) } @Test fun uIntValue() { val annotation = KmAnnotation( "test/UIntValueAnnotation", - mapOf("value" to UIntValue(2u)) + mapOf("value" to UIntValue(2u)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.UIntValueAnnotation(value = 2u) - """.trimIndent() + """.trimIndent(), ) } @Test fun uLongValue() { val annotation = KmAnnotation( "test/ULongValueAnnotation", - mapOf("value" to ULongValue(2u)) + mapOf("value" to ULongValue(2u)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.ULongValueAnnotation(value = 2u) - """.trimIndent() + """.trimIndent(), ) } @Test fun stringValue() { val annotation = KmAnnotation( "test/StringValueAnnotation", - mapOf("value" to StringValue("taco")) + mapOf("value" to StringValue("taco")), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.StringValueAnnotation(value = "taco") - """.trimIndent() + """.trimIndent(), ) } @Test fun kClassValue() { val annotation = KmAnnotation( "test/KClassValueAnnotation", - mapOf("value" to KClassValue("test/OtherClass", 0)) + mapOf("value" to KClassValue("test/OtherClass", 0)), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.KClassValueAnnotation(value = test.OtherClass::class) - """.trimIndent() + """.trimIndent(), ) } @Test fun enumValue() { val annotation = KmAnnotation( "test/EnumValueAnnotation", - mapOf("value" to EnumValue("test/OtherClass", "VALUE")) + mapOf("value" to EnumValue("test/OtherClass", "VALUE")), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.EnumValueAnnotation(value = test.OtherClass.VALUE) - """.trimIndent() + """.trimIndent(), ) } @@ -235,26 +235,26 @@ class KmAnnotationsTest { "test/AnnotationValueAnnotation", mapOf( "value" to AnnotationValue( - KmAnnotation("test/OtherAnnotation", mapOf("value" to StringValue("Hello!"))) - ) - ) + KmAnnotation("test/OtherAnnotation", mapOf("value" to StringValue("Hello!"))), + ), + ), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.AnnotationValueAnnotation(value = test.OtherAnnotation(value = "Hello!")) - """.trimIndent() + """.trimIndent(), ) } @Test fun arrayValue() { val annotation = KmAnnotation( "test/ArrayValueAnnotation", - mapOf("value" to ArrayValue(listOf(IntValue(1), IntValue(2), IntValue(3)))) + mapOf("value" to ArrayValue(listOf(IntValue(1), IntValue(2), IntValue(3)))), ) assertThat(annotation.toAnnotationSpec().toString()).isEqualTo( """ @test.ArrayValueAnnotation(value = [1, 2, 3]) - """.trimIndent() + """.trimIndent(), ) } } diff --git a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/KotlinPoetMetadataSpecsTest.kt b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/KotlinPoetMetadataSpecsTest.kt index fc84d554..5d3a6abd 100644 --- a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/KotlinPoetMetadataSpecsTest.kt +++ b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/KotlinPoetMetadataSpecsTest.kt @@ -65,7 +65,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { ) { public constructor(bar: kotlin.Int) } - """.trimIndent() + """.trimIndent(), ) } @@ -83,7 +83,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { assertThat(typeSpec.trimmedToString()).isEqualTo( """ public class Supertype() : com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.BaseType(), com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.BaseInterface - """.trimIndent() + """.trimIndent(), ) } @@ -93,7 +93,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @IgnoreForHandlerType( reason = "Elements properly resolves the string constant", - handlerType = ELEMENTS + handlerType = ELEMENTS, ) @Test fun propertiesReflective() { @@ -111,13 +111,13 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public val foo: kotlin.String = throw NotImplementedError("Stub!") } - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( reason = "Elements properly resolves the string constant", - handlerType = REFLECTIVE + handlerType = REFLECTIVE, ) @Test fun propertiesElements() { @@ -135,7 +135,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public val foo: kotlin.String = throw NotImplementedError("Stub!") } - """.trimIndent() + """.trimIndent(), ) } @@ -155,7 +155,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public class CompanionObject() { public companion object } - """.trimIndent() + """.trimIndent(), ) } @@ -172,7 +172,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public class NamedCompanionObject() { public companion object Named } - """.trimIndent() + """.trimIndent(), ) } @@ -189,7 +189,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public class Generics<out T, in R, V>( public val genericInput: T, ) - """.trimIndent() + """.trimIndent(), ) } @@ -206,7 +206,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public val foo: com.squareup.kotlinpoet.metadata.specs.TypeAliasName, public val bar: com.squareup.kotlinpoet.metadata.specs.GenericTypeAlias, ) - """.trimIndent() + """.trimIndent(), ) val fooPropertyType = typeSpec.propertySpecs.first { it.name == "foo" }.type @@ -232,7 +232,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public val foo: kotlin.String, public var mutableFoo: kotlin.String, ) - """.trimIndent() + """.trimIndent(), ) } @@ -248,7 +248,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public val immutableList: kotlin.collections.List<kotlin.String>, public val mutableList: kotlin.collections.MutableList<kotlin.String>, ) - """.trimIndent() + """.trimIndent(), ) } @@ -272,7 +272,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public suspend fun testSuspendFun(param1: kotlin.String): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } @@ -304,7 +304,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public inline fun `noinline`(noinline param1: () -> kotlin.String): kotlin.String = throw NotImplementedError("Stub!") } - """.trimIndent() + """.trimIndent(), ) } @@ -336,7 +336,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun lambdaReceiver3(block: kotlin.String.(kotlin.Int, kotlin.String) -> kotlin.Unit): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } @@ -359,7 +359,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public class NestedTypeAliasTest() { public val prop: com.squareup.kotlinpoet.metadata.specs.NestedTypeAlias = throw NotImplementedError("Stub!") } - """.trimIndent() + """.trimIndent(), ) } @@ -378,7 +378,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public value class InlineClass( public val `value`: kotlin.String, ) - """.trimIndent() + """.trimIndent(), ) } @@ -393,7 +393,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public value class ValueClass( public val `value`: kotlin.String, ) - """.trimIndent() + """.trimIndent(), ) } @@ -408,7 +408,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun test(`param`: T): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } @@ -435,7 +435,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public override fun openFunctionInterface(): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } @@ -490,7 +490,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { */ public var mutableNullable: kotlin.String? by kotlin.properties.Delegates.observable(null) { _, _, _ -> } } - """.trimIndent() + """.trimIndent(), ) } @@ -513,7 +513,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public class ClassDelegation<T>( delegate: List<T> ): List<T> by delegate - """.trimIndent() + """.trimIndent(), ) } @@ -531,7 +531,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { BAR, BAZ, } - """.trimIndent() + """.trimIndent(), ) } @@ -560,7 +560,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { }, ; } - """.trimIndent() + """.trimIndent(), ) } @@ -595,7 +595,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { BAR, BAZ, } - """.trimIndent() + """.trimIndent(), ) } @@ -626,7 +626,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { }, ; } - """.trimIndent() + """.trimIndent(), ) } @@ -636,6 +636,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { return "foo1" } }, + @FieldAnnotation BAR("bar") { override fun toString(): String { @@ -676,7 +677,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun noDefaultWithInputDefault(input: kotlin.String = throw NotImplementedError("Stub!")): kotlin.Unit } - """.trimIndent() + """.trimIndent(), ) val subInterfaceSpec = SubInterface::class.toTypeSpecWithTestHandler() @@ -695,7 +696,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun subInterfaceFunction(): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) val implSpec = TestSubInterfaceImpl::class.toTypeSpecWithTestHandler() @@ -713,7 +714,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public override fun noDefaultWithInputDefault(input: kotlin.String): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } @@ -778,7 +779,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { assertThat(typeSpec.trimmedToString()).isEqualTo( """ public interface BackwardReferencingTypeVars<T> : kotlin.collections.List<kotlin.collections.Set<T>> - """.trimIndent() + """.trimIndent(), ) } @@ -822,7 +823,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public annotation class MyAnnotation( public val `value`: kotlin.String, ) - """.trimIndent() + """.trimIndent(), ) } @@ -851,7 +852,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public inline fun <reified T> `reified`(`param`: T): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) val func1TypeVar = typeSpec.funSpecs.find { it.name == "functionAlsoWithT" }!!.typeVariables.first() @@ -867,6 +868,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { } fun <R> functionWithADifferentType(param: R) { } + // Regression for https://github.com/square/kotlinpoet/issues/829 inline fun <reified T> reified(param: T) { } @@ -882,7 +884,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public class ComplexCompanionObject() { public companion object ComplexObject : com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.CompanionBase(), com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.CompanionInterface } - """.trimIndent() + """.trimIndent(), ) } @@ -895,7 +897,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @IgnoreForHandlerType( reason = "TODO Synthetic methods that hold annotations aren't visible in these tests", - handlerType = ELEMENTS + handlerType = ELEMENTS, ) @Test fun annotationsAreCopied() { @@ -925,7 +927,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun function(): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } @@ -936,12 +938,17 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @field:FieldAnnotation var field: String? = null + @get:GetterAnnotation var getter: String? = null + @set:SetterAnnotation var setter: String? = null + @HolderAnnotation - @JvmField var holder: String? = null + @JvmField + var holder: String? = null + @FunctionAnnotation fun function() { } @@ -967,7 +974,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @IgnoreForHandlerType( reason = "Elements properly resolves the regular properties + JvmStatic, but reflection will not", - handlerType = REFLECTIVE + handlerType = REFLECTIVE, ) @Test fun constantValuesElements() { @@ -1052,7 +1059,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public val STATIC_CONST_UNDERSCORES_PROP: kotlin.Int = throw NotImplementedError("Stub!") } } - """.trimIndent() + """.trimIndent(), ) // TODO check with objects @@ -1060,7 +1067,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @IgnoreForHandlerType( reason = "Elements properly resolves the regular properties + JvmStatic, but reflection will not", - handlerType = ELEMENTS + handlerType = ELEMENTS, ) @Test fun constantValuesReflective() { @@ -1145,12 +1152,12 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public val STATIC_CONST_UNDERSCORES_PROP: kotlin.Int = 1000000 } } - """.trimIndent() + """.trimIndent(), ) } class Constants( - val param: String = "param" + val param: String = "param", ) { val boolProp = false val binaryProp = 0b00001011 @@ -1165,14 +1172,23 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { companion object { @JvmStatic val STATIC_CONST_BOOL_PROP = false + @JvmStatic val STATIC_CONST_BINARY_PROP = 0b00001011 + @JvmStatic val STATIC_CONST_INT_PROP = 1 + @JvmStatic val STATIC_CONST_UNDERSCORES_PROP = 1_000_000 + @JvmStatic val STATIC_CONST_HEX_PROP = 0x0F + @JvmStatic val STATIC_CONST_UNDERSCORES_HEX_PROP = 0xFF_EC_DE_5E + @JvmStatic val STATIC_CONST_LONG_PROP = 1L + @JvmStatic val STATIC_CONST_FLOAT_PROP = 1.0f + @JvmStatic val STATIC_CONST_DOUBLE_PROP = 1.0 + @JvmStatic val STATIC_CONST_STRING_PROP = "prop" const val CONST_BOOL_PROP = false @@ -1212,7 +1228,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun synchronizedFun(): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) val interfaceSpec = JvmAnnotationsInterface::class.toTypeSpecWithTestHandler() @@ -1227,14 +1243,17 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun notDefaultMethod(): kotlin.Unit } - """.trimIndent() + """.trimIndent(), ) } class JvmAnnotations { @Transient val transientProp: String? = null + @Volatile var volatileProp: String? = null + @get:Synchronized val synchronizedGetProp: String? = null + @set:Synchronized var synchronizedSetProp: String? = null @Synchronized @@ -1261,7 +1280,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public inner class NestedInnerClass() } - """.trimIndent() + """.trimIndent(), ) } @@ -1273,7 +1292,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @IgnoreForHandlerType( reason = "Reflection properly resolves companion properties + JvmStatic + JvmName, but " + "elements will not", - handlerType = ELEMENTS + handlerType = ELEMENTS, ) @Test fun jvmNamesReflective() { @@ -1313,14 +1332,14 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { } } } - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( reason = "Reflection properly resolves companion properties + JvmStatic + JvmName, but " + "elements will not", - handlerType = REFLECTIVE + handlerType = REFLECTIVE, ) @Test fun jvmNamesElements() { @@ -1360,12 +1379,12 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { } } } - """.trimIndent() + """.trimIndent(), ) } class JvmNameData( - @get:JvmName("jvmParam") val param: String + @get:JvmName("jvmParam") val param: String, ) { @get:JvmName("jvmPropertyGet") @@ -1400,7 +1419,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @IgnoreForHandlerType( reason = "JvmOverloads is not runtime retained and thus not visible to reflection.", - handlerType = REFLECTIVE + handlerType = REFLECTIVE, ) @Test fun overloads() { @@ -1422,27 +1441,27 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { ): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } class Overloads @JvmOverloads constructor( val param1: String, val optionalParam2: String = "", - val nullableParam3: String? = null + val nullableParam3: String? = null, ) { @JvmOverloads fun testFunction( param1: String, optionalParam2: String = "", - nullableParam3: String? = null + nullableParam3: String? = null, ) { } } @IgnoreForHandlerType( reason = "Elements generates initializer values.", - handlerType = ELEMENTS + handlerType = ELEMENTS, ) @Test fun jvmFields_reflective() { @@ -1468,13 +1487,13 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public val staticCompanionProp: kotlin.String = "" } } - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( reason = "Elements generates initializer values.", - handlerType = REFLECTIVE + handlerType = REFLECTIVE, ) @Test fun jvmFields_elements() { @@ -1500,17 +1519,18 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public val staticCompanionProp: kotlin.String = throw NotImplementedError("Stub!") } } - """.trimIndent() + """.trimIndent(), ) } class Fields( - @JvmField val param1: String + @JvmField val param1: String, ) { @JvmField val fieldProp: String = "" companion object { @JvmField val companionProp: String = "" + @JvmStatic val staticCompanionProp: String = "" const val constCompanionProp: String = "" } @@ -1519,7 +1539,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @IgnoreForHandlerType( reason = "Synthetic constructs aren't available in elements, so some information like " + "JvmStatic can't be deduced.", - handlerType = ELEMENTS + handlerType = ELEMENTS, ) @Test fun synthetics_reflective() { @@ -1577,14 +1597,14 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { } } } - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( reason = "Synthetic constructs aren't available in elements, so some information like " + "JvmStatic can't be deduced.", - handlerType = REFLECTIVE + handlerType = REFLECTIVE, ) @Test fun synthetics_elements() { @@ -1641,12 +1661,12 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { } } } - """.trimIndent() + """.trimIndent(), ) } class Synthetics( - @get:JvmSynthetic val param: String + @get:JvmSynthetic val param: String, ) { @JvmSynthetic @@ -1710,11 +1730,13 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun testFunction(): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } - class Throwing @Throws(IllegalStateException::class) constructor() { + class Throwing + @Throws(IllegalStateException::class) + constructor() { @get:Throws(IllegalStateException::class) val getterThrows: String? = null @@ -1734,7 +1756,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { // The meta-ist of metadata meta-tests. @IgnoreForHandlerType( reason = "Reflection can't parse non-runtime retained annotations", - handlerType = REFLECTIVE + handlerType = REFLECTIVE, ) @Test fun metaTest_elements() { @@ -1763,14 +1785,14 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @get:kotlin.jvm.JvmName(name = "xi") public val extraInt: kotlin.Int = throw NotImplementedError("Stub!"), ) - """.trimIndent() + """.trimIndent(), ) } // The meta-ist of metadata meta-tests. @IgnoreForHandlerType( reason = "Reflection can't parse non-runtime retained annotations", - handlerType = ELEMENTS + handlerType = ELEMENTS, ) @Test fun metaTest_reflection() { @@ -1798,7 +1820,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @get:kotlin.jvm.JvmName(name = "xi") public val extraInt: kotlin.Int = throw NotImplementedError("Stub!"), ) - """.trimIndent() + """.trimIndent(), ) } @@ -1816,14 +1838,14 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { } } } - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( reason = "compile-testing can't handle class names with dashes, will throw " + "\"class file for com.squareup.kotlinpoet.metadata.specs.Fuzzy\$ClassNesting\$-Nested not found\"", - handlerType = ELEMENTS + handlerType = ELEMENTS, ) @Test fun classNamesAndNesting_pathological() { @@ -1839,14 +1861,14 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { } } } - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( reason = "Property site-target annotations are always stored on the synthetic annotations " + "method, which is not accessible in the elements API", - handlerType = ELEMENTS + handlerType = ELEMENTS, ) @Test fun parameterAnnotations_reflective() { @@ -1864,14 +1886,14 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun function(@com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.CustomAnnotation(name = "woo") param1: kotlin.String): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( reason = "Property site-target annotations are always stored on the synthetic annotations " + "method, which is not accessible in the elements API", - handlerType = REFLECTIVE + handlerType = REFLECTIVE, ) @Test fun parameterAnnotations_elements() { @@ -1888,15 +1910,16 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun function(@com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.CustomAnnotation(name = "woo") param1: kotlin.String): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } annotation class CustomAnnotation(val name: String) class ParameterAnnotations( - @property:CustomAnnotation("\$a") @param:CustomAnnotation("b") val param1: String, - @CustomAnnotation("2") param2: String + @property:CustomAnnotation("\$a") @param:CustomAnnotation("b") + val param1: String, + @CustomAnnotation("2") param2: String, ) { fun function(@CustomAnnotation("woo") param1: String) { } @@ -1904,7 +1927,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @IgnoreForHandlerType( reason = "Non-runtime annotations are not present for reflection.", - handlerType = ELEMENTS + handlerType = ELEMENTS, ) @Test fun classAnnotations_reflective() { @@ -1914,13 +1937,13 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { """ @com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.RuntimeCustomClassAnnotation(name = "Runtime") public class ClassAnnotations() - """.trimIndent() + """.trimIndent(), ) } @IgnoreForHandlerType( reason = "Non-runtime annotations are not present for reflection.", - handlerType = REFLECTIVE + handlerType = REFLECTIVE, ) @Test fun classAnnotations_elements() { @@ -1931,7 +1954,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { @com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.BinaryCustomClassAnnotation(name = "Binary") @com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.RuntimeCustomClassAnnotation(name = "Runtime") public class ClassAnnotations() - """.trimIndent() + """.trimIndent(), ) } @@ -1961,7 +1984,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun <T> bar(input: @com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.TypeAnnotation kotlin.String, input2: @com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.TypeAnnotation (@com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.TypeAnnotation kotlin.Int) -> @com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.TypeAnnotation kotlin.String): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } @@ -1973,7 +1996,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { fun <@TypeAnnotation T> bar( input: @TypeAnnotation String, - input2: @TypeAnnotation (@TypeAnnotation Int) -> @TypeAnnotation String + input2: @TypeAnnotation (@TypeAnnotation Int) -> @TypeAnnotation String, ) { } } @@ -1993,7 +2016,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public class AssetOut<out B : com.squareup.kotlinpoet.metadata.specs.KotlinPoetMetadataSpecsTest.Asset.AssetOut<B>>() } - """.trimIndent() + """.trimIndent(), ) } @@ -2027,7 +2050,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun fuzWithReturn(): kotlin.String = throw NotImplementedError("Stub!") } - """.trimIndent() + """.trimIndent(), ) } @@ -2056,7 +2079,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { internal abstract var varProp: kotlin.String } - """.trimIndent() + """.trimIndent(), ) } @@ -2088,7 +2111,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public open fun openFun(): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) val finalAbstractModalities = FinalAbstractModalities::class.toTypeSpecWithTestHandler() @@ -2102,7 +2125,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public final override fun interfaceFun(): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) val modalities = Modalities::class.toTypeSpecWithTestHandler() @@ -2121,7 +2144,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public override fun openFun(): kotlin.Unit { } } - """.trimIndent() + """.trimIndent(), ) } @@ -2165,7 +2188,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public fun interface FunInterface { public fun example(): kotlin.Unit } - """.trimIndent() + """.trimIndent(), ) } @@ -2185,7 +2208,7 @@ class KotlinPoetMetadataSpecsTest : MultiClassInspectorTest() { public var t: T? = null } - """.trimIndent() + """.trimIndent(), ) } @@ -2216,6 +2239,7 @@ private fun TypeSpec.trimmedToString(): String { } inline class InlineClass(val value: String) + @JvmInline value class ValueClass(val value: String) diff --git a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/MultiClassInspectorTest.kt b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/MultiClassInspectorTest.kt index 4b12488b..10827fd9 100644 --- a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/MultiClassInspectorTest.kt +++ b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/MultiClassInspectorTest.kt @@ -46,7 +46,7 @@ abstract class MultiClassInspectorTest { fun data(): Collection<Array<ClassInspectorType>> { return listOf( arrayOf(ClassInspectorType.REFLECTIVE), - arrayOf(ClassInspectorType.ELEMENTS) + arrayOf(ClassInspectorType.ELEMENTS), ) } } @@ -76,7 +76,7 @@ abstract class MultiClassInspectorTest { @Inherited annotation class IgnoreForHandlerType( val reason: String, - val handlerType: ClassInspectorType + val handlerType: ClassInspectorType, ) @JvmField @@ -93,12 +93,12 @@ abstract class MultiClassInspectorTest { object : Statement() { override fun evaluate() { val annotation = description.getAnnotation( - IgnoreForHandlerType::class.java + IgnoreForHandlerType::class.java, ) val shouldIgnore = annotation?.handlerType == classInspectorType Assume.assumeTrue( "Ignoring ${description.methodName}: ${annotation?.reason}", - !shouldIgnore + !shouldIgnore, ) base.evaluate() } diff --git a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/ReflectiveClassInspectorTest.kt b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/ReflectiveClassInspectorTest.kt index 35e6b065..a4ecc3de 100644 --- a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/ReflectiveClassInspectorTest.kt +++ b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/ReflectiveClassInspectorTest.kt @@ -65,7 +65,7 @@ class ReflectiveClassInspectorTest { """ package $testPackageName data class $testClass(val $testPropertyName: $testPropertyType) - """.trimIndent() + """.trimIndent(), ) val result = KotlinCompilation().apply { diff --git a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/classinspectors/ClassInspectorUtilTest.kt b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/classinspectors/ClassInspectorUtilTest.kt index 81370443..4e1c268b 100644 --- a/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/classinspectors/ClassInspectorUtilTest.kt +++ b/interop/kotlinx-metadata/src/test/kotlin/com/squareup/kotlinpoet/metadata/specs/classinspectors/ClassInspectorUtilTest.kt @@ -90,7 +90,7 @@ class ClassInspectorUtilTest { .isEqualTo( AnnotationSpec.builder(Throws::class.asClassName()) .addMember("exceptionClasses = [%T::class]", Exception::class.asClassName()) - .build() + .build(), ) } } diff --git a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/annotations.kt b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/Annotations.kt index fb11f785..b8ca2b67 100644 --- a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/annotations.kt +++ b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/Annotations.kt @@ -91,8 +91,9 @@ private fun addValueToBlock(value: Any, member: CodeBlock.Builder) { } is KSName -> member.add( - "%T.%L", ClassName.bestGuess(value.getQualifier()), - value.getShortName() + "%T.%L", + ClassName.bestGuess(value.getQualifier()), + value.getShortName(), ) is KSAnnotation -> member.add("%L", value.toAnnotationSpec()) else -> member.add(memberForValue(value)) diff --git a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/ksClassDeclarations.kt b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/KsClassDeclarations.kt index 443be1b3..443be1b3 100644 --- a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/ksClassDeclarations.kt +++ b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/KsClassDeclarations.kt diff --git a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/ksTypes.kt b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/KsTypes.kt index 49a1df92..a034fb62 100644 --- a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/ksTypes.kt +++ b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/KsTypes.kt @@ -51,7 +51,7 @@ public fun KSType.toClassName(): ClassName { * defined by [KSType.arguments]. */ public fun KSType.toTypeName( - typeParamResolver: TypeParameterResolver = TypeParameterResolver.EMPTY + typeParamResolver: TypeParameterResolver = TypeParameterResolver.EMPTY, ): TypeName = toTypeName(typeParamResolver, emptyList()) internal fun KSType.toTypeName( @@ -136,7 +136,7 @@ private fun mapTypeArgumentsFromTypeAliasToAbbreviatedType( * defined by [KSType.arguments]. */ public fun KSTypeParameter.toTypeVariableName( - typeParamResolver: TypeParameterResolver = TypeParameterResolver.EMPTY + typeParamResolver: TypeParameterResolver = TypeParameterResolver.EMPTY, ): TypeVariableName { val typeVarName = name.getShortName() val typeVarBounds = bounds.map { it.toTypeName(typeParamResolver) }.toList() @@ -157,7 +157,7 @@ public fun KSTypeParameter.toTypeVariableName( * defined by [KSType.arguments]. */ public fun KSTypeArgument.toTypeName( - typeParamResolver: TypeParameterResolver = TypeParameterResolver.EMPTY + typeParamResolver: TypeParameterResolver = TypeParameterResolver.EMPTY, ): TypeName { val type = this.type ?: return STAR return when (variance) { @@ -177,7 +177,7 @@ public fun KSTypeArgument.toTypeName( * defined by [KSType.arguments]. */ public fun KSTypeReference.toTypeName( - typeParamResolver: TypeParameterResolver = TypeParameterResolver.EMPTY + typeParamResolver: TypeParameterResolver = TypeParameterResolver.EMPTY, ): TypeName { return resolve().toTypeName(typeParamResolver, element?.typeArguments.orEmpty()) } diff --git a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/modifiers.kt b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/Modifiers.kt index d4d8aa56..d4d8aa56 100644 --- a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/modifiers.kt +++ b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/Modifiers.kt diff --git a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/originatingKSFiles.kt b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/OriginatingKSFiles.kt index 8e48c281..f7c40b3d 100644 --- a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/originatingKSFiles.kt +++ b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/OriginatingKSFiles.kt @@ -105,7 +105,7 @@ public fun TypeSpec.Builder.addOriginatingKSFile(ksFile: KSFile): TypeSpec.Build public fun FileSpec.writeTo( codeGenerator: CodeGenerator, aggregating: Boolean, - originatingKSFiles: Iterable<KSFile> = originatingKSFiles() + originatingKSFiles: Iterable<KSFile> = originatingKSFiles(), ) { val dependencies = kspDependencies(aggregating, originatingKSFiles) writeTo(codeGenerator, dependencies) @@ -123,7 +123,7 @@ public fun FileSpec.writeTo( */ public fun FileSpec.writeTo( codeGenerator: CodeGenerator, - dependencies: Dependencies + dependencies: Dependencies, ) { val file = codeGenerator.createNewFile(dependencies, packageName, name) // Don't use writeTo(file) because that tries to handle directories under the hood @@ -147,7 +147,7 @@ public fun FileSpec.writeTo( */ public fun FileSpec.kspDependencies( aggregating: Boolean, - originatingKSFiles: Iterable<KSFile> = originatingKSFiles() + originatingKSFiles: Iterable<KSFile> = originatingKSFiles(), ): Dependencies = Dependencies(aggregating, *originatingKSFiles.toList().toTypedArray()) /** @@ -165,7 +165,8 @@ private fun Taggable.getKSFilesTag(): List<KSFile> { private fun Taggable.Builder<*>.getOrCreateKSFilesTag(): MutableList<KSFile> { val holder = tags.getOrPut( - OriginatingKSFiles::class, ::MutableOriginatingKSFilesImpl + OriginatingKSFiles::class, + ::MutableOriginatingKSFilesImpl, ) as MutableOriginatingKSFiles return holder.files } diff --git a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/TypeParameterResolver.kt b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/TypeParameterResolver.kt index 218b96df..1304b2a4 100644 --- a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/TypeParameterResolver.kt +++ b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/TypeParameterResolver.kt @@ -67,7 +67,7 @@ public fun List<KSTypeParameter>.toTypeParameterResolver( ?: parent?.get(id) ?: throw IllegalStateException( "No type argument found for $id! Analyzed $sourceTypeHint with known parameters " + - "${parametersMap.keys}" + "${parametersMap.keys}", ) } diff --git a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/visibilities.kt b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/Visibilities.kt index e8b24c42..dcca6d2e 100644 --- a/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/visibilities.kt +++ b/interop/ksp/src/main/kotlin/com/squareup/kotlinpoet/ksp/Visibilities.kt @@ -16,12 +16,8 @@ package com.squareup.kotlinpoet.ksp import com.google.devtools.ksp.symbol.Visibility -import com.google.devtools.ksp.symbol.Visibility.INTERNAL import com.google.devtools.ksp.symbol.Visibility.JAVA_PACKAGE import com.google.devtools.ksp.symbol.Visibility.LOCAL -import com.google.devtools.ksp.symbol.Visibility.PRIVATE -import com.google.devtools.ksp.symbol.Visibility.PROTECTED -import com.google.devtools.ksp.symbol.Visibility.PUBLIC import com.squareup.kotlinpoet.KModifier /** @@ -30,10 +26,10 @@ import com.squareup.kotlinpoet.KModifier */ public fun Visibility.toKModifier(): KModifier? { return when (this) { - PUBLIC -> KModifier.PUBLIC - PRIVATE -> KModifier.PRIVATE - PROTECTED -> KModifier.PROTECTED - INTERNAL -> KModifier.INTERNAL + Visibility.PUBLIC -> KModifier.PUBLIC + Visibility.PRIVATE -> KModifier.PRIVATE + Visibility.PROTECTED -> KModifier.PROTECTED + Visibility.INTERNAL -> KModifier.INTERNAL else -> null } } diff --git a/interop/ksp/test-processor/src/main/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TestProcessor.kt b/interop/ksp/test-processor/src/main/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TestProcessor.kt index 4e6963d0..b1d41d40 100644 --- a/interop/ksp/test-processor/src/main/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TestProcessor.kt +++ b/interop/ksp/test-processor/src/main/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TestProcessor.kt @@ -64,7 +64,7 @@ class TestProcessor(private val env: SymbolProcessorEnvironment) : SymbolProcess addAnnotations( decl.annotations .filterNot { it.shortName.getShortName() == "ExampleAnnotation" } - .map { it.toAnnotationSpec() }.asIterable() + .map { it.toAnnotationSpec() }.asIterable(), ) } val classTypeParams = decl.typeParameters.toTypeParameterResolver() @@ -77,7 +77,7 @@ class TestProcessor(private val env: SymbolProcessorEnvironment) : SymbolProcess it } } - } + }, ) // Add properties @@ -91,7 +91,7 @@ class TestProcessor(private val env: SymbolProcessorEnvironment) : SymbolProcess } else { it } - } + }, ) .addOriginatingKSFile(decl.containingFile!!) .mutable(property.isMutable) @@ -100,10 +100,10 @@ class TestProcessor(private val env: SymbolProcessorEnvironment) : SymbolProcess addModifiers(property.modifiers.mapNotNull { it.toKModifier() }) addAnnotations( property.annotations - .map { it.toAnnotationSpec() }.asIterable() + .map { it.toAnnotationSpec() }.asIterable(), ) } - .build() + .build(), ) } @@ -126,7 +126,7 @@ class TestProcessor(private val env: SymbolProcessorEnvironment) : SymbolProcess it } } - } + }, ) .addParameters( function.parameters.map { parameter -> @@ -140,7 +140,7 @@ class TestProcessor(private val env: SymbolProcessorEnvironment) : SymbolProcess parameter.name?.let { ParameterSpec.builder(it.getShortName(), parameterType).build() } ?: ParameterSpec.unnamed(parameterType) - } + }, ) .returns( function.returnType!!.toTypeName(functionTypeParams).let { @@ -149,9 +149,9 @@ class TestProcessor(private val env: SymbolProcessorEnvironment) : SymbolProcess } else { it } - } + }, ) - .build() + .build(), ) } diff --git a/interop/ksp/test-processor/src/main/kotlin/com/squareup/kotlinpoet/ksp/test/processor/typeAliasUnwrapping.kt b/interop/ksp/test-processor/src/main/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TypeAliasUnwrapping.kt index 85bfe78f..599f8d70 100644 --- a/interop/ksp/test-processor/src/main/kotlin/com/squareup/kotlinpoet/ksp/test/processor/typeAliasUnwrapping.kt +++ b/interop/ksp/test-processor/src/main/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TypeAliasUnwrapping.kt @@ -51,7 +51,7 @@ internal fun TypeVariableName.unwrapTypeAlias(): TypeVariableName { return TypeVariableName( name = name, bounds = bounds.map { it.unwrapTypeAlias() }, - variance = variance + variance = variance, ) .copy(nullable = isNullable, annotations = annotations, tags = tags) } diff --git a/interop/ksp/test-processor/src/test/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TestProcessorTest.kt b/interop/ksp/test-processor/src/test/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TestProcessorTest.kt index e6ed4eff..38430c68 100644 --- a/interop/ksp/test-processor/src/test/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TestProcessorTest.kt +++ b/interop/ksp/test-processor/src/test/kotlin/com/squareup/kotlinpoet/ksp/test/processor/TestProcessorTest.kt @@ -134,8 +134,8 @@ class TestProcessorTest { } } - """ - ) + """, + ), ) val result = compilation.compile() assertThat(result.exitCode).isEqualTo(KotlinCompilation.ExitCode.OK) @@ -252,7 +252,7 @@ class TestProcessorTest { } } - """.trimIndent() + """.trimIndent(), ) } @@ -284,8 +284,8 @@ class TestProcessorTest { ) { } } - """ - ) + """, + ), ) compilation.kspArgs["unwrapTypeAliases"] = "true" val result = compilation.compile() @@ -313,7 +313,7 @@ class TestProcessorTest { } } - """.trimIndent() + """.trimIndent(), ) } @@ -332,8 +332,8 @@ class TestProcessorTest { var t: T? = null var r: R? = null } - """ - ) + """, + ), ) val result = compilation.compile() @@ -350,7 +350,7 @@ class TestProcessorTest { public var r: R? } - """.trimIndent() + """.trimIndent(), ) } @@ -369,8 +369,8 @@ class TestProcessorTest { class EnumWrapper { val enumValue: Enum<*> } - """ - ) + """, + ), ) val result = compilation.compile() @@ -387,7 +387,7 @@ class TestProcessorTest { public val enumValue: Enum<*> } - """.trimIndent() + """.trimIndent(), ) } @@ -414,8 +414,8 @@ class TestProcessorTest { interface TransitiveAliases { fun <T : Alias41<Alias23, out Alias77<Alias73<Int>>>> bar(vararg arg1: T) } - """ - ) + """, + ), ) val result = compilation.compile() @@ -434,7 +434,7 @@ class TestProcessorTest { } } - """.trimIndent() + """.trimIndent(), ) } diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/AnnotationSpec.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/AnnotationSpec.kt index 37c69eb6..d44264b6 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/AnnotationSpec.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/AnnotationSpec.kt @@ -28,11 +28,11 @@ import kotlin.reflect.KClass /** A generated annotation on a declaration. */ public class AnnotationSpec private constructor( builder: Builder, - private val tagMap: TagMap = builder.buildTagMap() + private val tagMap: TagMap = builder.buildTagMap(), ) : Taggable by tagMap { @Deprecated( message = "Use typeName instead. This property will be removed in KotlinPoet 2.0.", - replaceWith = ReplaceWith("typeName") + replaceWith = ReplaceWith("typeName"), ) public val className: ClassName get() = typeName as? ClassName ?: error("ClassName is not available. Call typeName instead.") @@ -73,7 +73,7 @@ public class AnnotationSpec private constructor( codeBlock = members .map { if (inline) it.replaceAll("[⇥|⇤]", "") else it } .joinToCode(separator = memberSeparator, suffix = memberSuffix), - isConstantContext = true + isConstantContext = true, ) if (members.size > 1) codeWriter.unindent(1).emit(whitespace) codeWriter.emit(")") @@ -113,7 +113,7 @@ public class AnnotationSpec private constructor( } public class Builder internal constructor( - internal val typeName: TypeName + internal val typeName: TypeName, ) : Taggable.Builder<Builder> { internal var useSiteTarget: UseSiteTarget? = null @@ -155,7 +155,7 @@ public class AnnotationSpec private constructor( */ @OptIn(DelicateKotlinPoetApi::class) private class Visitor( - val builder: CodeBlock.Builder + val builder: CodeBlock.Builder, ) : SimpleAnnotationValueVisitor7<CodeBlock.Builder, String>(builder) { override fun defaultAction(o: Any, name: String) = @@ -184,13 +184,13 @@ public class AnnotationSpec private constructor( public companion object { @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) @JvmStatic @JvmOverloads public fun get( annotation: Annotation, - includeDefaultValues: Boolean = false + includeDefaultValues: Boolean = false, ): AnnotationSpec { try { @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN") @@ -233,7 +233,7 @@ public class AnnotationSpec private constructor( @DelicateKotlinPoetApi( message = "Mirror APIs don't give complete information on Kotlin types. Consider using" + - " the kotlinpoet-metadata APIs instead." + " the kotlinpoet-metadata APIs instead.", ) @JvmStatic public fun get(annotation: AnnotationMirror): AnnotationSpec { @@ -257,7 +257,7 @@ public class AnnotationSpec private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) @JvmStatic public fun builder(type: Class<out Annotation>): Builder = diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeBlock.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeBlock.kt index 36839020..6316e3f2 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeBlock.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeBlock.kt @@ -58,7 +58,7 @@ import kotlin.reflect.KClass */ public class CodeBlock private constructor( internal val formatParts: List<String>, - internal val args: List<Any?> + internal val args: List<Any?>, ) { /** A heterogeneous list containing string literals and value placeholders. */ @@ -310,7 +310,7 @@ public class CodeBlock private constructor( require(index >= 0 && index < args.size) { "index ${index + 1} for '${format.substring( indexStart - 1, - indexEnd + 1 + indexEnd + 1, )}' not in range (received ${args.size} arguments)" } require(!hasIndexed || !hasRelative) { "cannot mix indexed and positional parameters" } @@ -346,7 +346,7 @@ public class CodeBlock private constructor( 'T' -> this.args += argToType(arg) 'M' -> this.args += arg else -> throw IllegalArgumentException( - String.format("invalid format string: '%s'", format) + String.format("invalid format string: '%s'", format), ) } } @@ -368,7 +368,7 @@ public class CodeBlock private constructor( private fun logDeprecationWarning(o: Any) { println( "Deprecation warning: converting $o to TypeName. Conversion of TypeMirror and" + - " TypeElement is deprecated in KotlinPoet, use kotlin-metadata APIs instead." + " TypeElement is deprecated in KotlinPoet, use kotlin-metadata APIs instead.", ) } @@ -461,6 +461,7 @@ public class CodeBlock private constructor( @JvmStatic public fun of(format: String, vararg args: Any?): CodeBlock = Builder().add(format, *args).build() + @JvmStatic public fun builder(): Builder = Builder() internal val Char.isMultiCharNoArgPlaceholder get() = this == '%' @@ -478,7 +479,7 @@ public class CodeBlock private constructor( public fun Collection<CodeBlock>.joinToCode( separator: CharSequence = ", ", prefix: CharSequence = "", - suffix: CharSequence = "" + suffix: CharSequence = "", ): CodeBlock { val blocks = toTypedArray() val placeholders = Array(blocks.size) { "%L" } diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeWriter.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeWriter.kt index a2755b14..5c25d207 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeWriter.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/CodeWriter.kt @@ -42,7 +42,7 @@ internal inline fun buildCodeString(builderAction: CodeWriter.() -> Unit): Strin internal fun buildCodeString( codeWriter: CodeWriter, - builderAction: CodeWriter.() -> Unit + builderAction: CodeWriter.() -> Unit, ): String { val stringBuilder = StringBuilder() codeWriter.emitInto(stringBuilder, builderAction) @@ -59,7 +59,7 @@ internal class CodeWriter constructor( private val memberImports: Map<String, Import> = emptyMap(), val importedTypes: Map<String, ClassName> = emptyMap(), val importedMembers: Map<String, MemberName> = emptyMap(), - columnLimit: Int = 100 + columnLimit: Int = 100, ) : Closeable { private var out = LineWrapper(out, indent, columnLimit) private var indentLevel = 0 @@ -154,7 +154,7 @@ internal class CodeWriter constructor( */ fun emitModifiers( modifiers: Set<KModifier>, - implicitModifiers: Set<KModifier> = emptySet() + implicitModifiers: Set<KModifier> = emptySet(), ) { if (shouldEmitPublicModifier(modifiers, implicitModifiers)) { emit(KModifier.PUBLIC.keyword) @@ -232,7 +232,7 @@ internal class CodeWriter constructor( fun emitCode( codeBlock: CodeBlock, isConstantContext: Boolean = false, - ensureTrailingNewline: Boolean = false + ensureTrailingNewline: Boolean = false, ) = apply { var a = 0 var deferredTypeName: ClassName? = null // used by "import static" logic @@ -250,7 +250,7 @@ internal class CodeWriter constructor( stringLiteralWithQuotes( string, escapeDollarSign = true, - isConstantContext = isConstantContext + isConstantContext = isConstantContext, ) } else { "null" @@ -271,7 +271,7 @@ internal class CodeWriter constructor( stringLiteralWithQuotes( string, escapeDollarSign = false, - isConstantContext = isConstantContext + isConstantContext = isConstantContext, ) } else { "null" @@ -397,7 +397,7 @@ internal class CodeWriter constructor( codeWriter = this, enclosingName = null, implicitModifiers = setOf(KModifier.PUBLIC), - includeKdocTags = true + includeKdocTags = true, ) is TypeAliasSpec -> o.emit(this) is CodeBlock -> emitCode(o, isConstantContext = isConstantContext) @@ -428,7 +428,7 @@ internal class CodeWriter constructor( referencedNames.add(className.topLevelClassName().simpleName) return className.simpleNames.subList( suffixOffset, - className.simpleNames.size + className.simpleNames.size, ).joinToString(".") } c = c.enclosingClassName() @@ -487,10 +487,12 @@ internal class CodeWriter constructor( // TODO(luqasn): also honor superclass members when resolving names. private fun isMethodNameUsedInCurrentContext(simpleName: String): Boolean { for (it in typeSpecStack.reversed()) { - if (it.funSpecs.any { it.name == simpleName }) + if (it.funSpecs.any { it.name == simpleName }) { return true - if (!it.modifiers.contains(KModifier.INNER)) + } + if (!it.modifiers.contains(KModifier.INNER)) { break + } } return false } @@ -606,7 +608,7 @@ internal class CodeWriter constructor( out.append( line, indentLevel = if (kdoc) indentLevel else indentLevel + 2, - linePrefix = if (kdoc) " * " else "" + linePrefix = if (kdoc) " * " else "", ) } trailingNewline = false @@ -628,7 +630,7 @@ internal class CodeWriter constructor( */ private fun shouldEmitPublicModifier( modifiers: Set<KModifier>, - implicitModifiers: Set<KModifier> + implicitModifiers: Set<KModifier>, ): Boolean { if (modifiers.contains(KModifier.PUBLIC)) { return true diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ContextReceivable.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ContextReceivable.kt index f04ee2ca..929096bc 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ContextReceivable.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ContextReceivable.kt @@ -50,5 +50,5 @@ internal fun ContextReceivable.Builder<*>.buildContextReceivers() = @JvmInline @ExperimentalKotlinPoetApi internal value class ContextReceivers( - override val contextReceiverTypes: List<TypeName> + override val contextReceiverTypes: List<TypeName>, ) : ContextReceivable diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/DelicateKotlinPoetApi.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/DelicateKotlinPoetApi.kt index a168fb6a..11369334 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/DelicateKotlinPoetApi.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/DelicateKotlinPoetApi.kt @@ -27,6 +27,6 @@ package com.squareup.kotlinpoet @RequiresOptIn( level = RequiresOptIn.Level.WARNING, message = "This is a delicate API and its use requires care." + - " Make sure you fully read and understand documentation of the declaration that is marked as a delicate API." + " Make sure you fully read and understand documentation of the declaration that is marked as a delicate API.", ) public annotation class DelicateKotlinPoetApi(val message: String) diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Dynamic.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Dynamic.kt index 0ad35757..413b7b7a 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Dynamic.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Dynamic.kt @@ -22,7 +22,7 @@ public object Dynamic : TypeName(false, emptyList(), TagMap(emptyMap())) { override fun copy( nullable: Boolean, annotations: List<AnnotationSpec>, - tags: Map<KClass<*>, Any> + tags: Map<KClass<*>, Any>, ): Nothing = throw UnsupportedOperationException("dynamic doesn't support copying") override fun emit(out: CodeWriter) = out.apply { diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/FileSpec.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/FileSpec.kt index 2d6f1dbf..7379eef6 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/FileSpec.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/FileSpec.kt @@ -45,7 +45,7 @@ import kotlin.reflect.KClass */ public class FileSpec private constructor( builder: Builder, - private val tagMap: TagMap = builder.buildTagMap() + private val tagMap: TagMap = builder.buildTagMap(), ) : Taggable by tagMap { public val annotations: List<AnnotationSpec> = builder.annotations.toImmutableList() public val comment: CodeBlock = builder.comment.build() @@ -63,8 +63,10 @@ public class FileSpec private constructor( public fun writeTo(out: Appendable) { // First pass: emit the entire class, just to collect the types we'll need to import. val importsCollector = CodeWriter( - NullAppendable, indent, memberImports, - columnLimit = Integer.MAX_VALUE + NullAppendable, + indent, + memberImports, + columnLimit = Integer.MAX_VALUE, ) emit(importsCollector, collectingImports = true) val suggestedTypeImports = importsCollector.suggestedTypeImports() @@ -73,8 +75,11 @@ public class FileSpec private constructor( // Second pass: write the code, taking advantage of the imports. val codeWriter = CodeWriter( - out, indent, memberImports, suggestedTypeImports, - suggestedMemberImports + out, + indent, + memberImports, + suggestedTypeImports, + suggestedMemberImports, ) emit(codeWriter, collectingImports = false) codeWriter.close() @@ -114,7 +119,7 @@ public class FileSpec private constructor( StandardLocation.SOURCE_OUTPUT, packageName, "$name.$extension", - *originatingElements.toTypedArray() + *originatingElements.toTypedArray(), ) try { filerSourceFile.openWriter().use { writer -> writeTo(writer) } @@ -207,11 +212,11 @@ public class FileSpec private constructor( public fun toJavaFileObject(): JavaFileObject { val uri = URI.create( - ( - if (packageName.isEmpty()) - name else - packageName.replace('.', '/') + '/' + name - ) + ".$extension" + if (packageName.isEmpty()) { + name + } else { + packageName.replace('.', '/') + '/' + name + } + ".$extension", ) return object : SimpleJavaFileObject(uri, Kind.SOURCE) { private val lastModified = System.currentTimeMillis() @@ -268,7 +273,7 @@ public class FileSpec private constructor( FILE -> annotationSpec null -> annotationSpec.toBuilder().useSiteTarget(FILE).build() else -> error( - "Use-site target ${annotationSpec.useSiteTarget} not supported for file annotations." + "Use-site target ${annotationSpec.useSiteTarget} not supported for file annotations.", ) } annotations += spec @@ -291,7 +296,7 @@ public class FileSpec private constructor( @Deprecated( "Use addFileComment() instead.", ReplaceWith("addFileComment(format, args)"), - DeprecationLevel.ERROR + DeprecationLevel.ERROR, ) public fun addComment(format: String, vararg args: Any): Builder = addFileComment(format, *args) @@ -335,7 +340,8 @@ public class FileSpec private constructor( } public fun addImport(constant: Enum<*>): Builder = addImport( - (constant as java.lang.Enum<*>).declaringClass.asClassName(), constant.name + (constant as java.lang.Enum<*>).declaringClass.asClassName(), + constant.name, ) public fun addImport(`class`: Class<*>, vararg names: String): Builder = apply { @@ -403,7 +409,7 @@ public class FileSpec private constructor( public fun addAliasedImport( className: ClassName, memberName: String, - `as`: String + `as`: String, ): Builder = apply { memberImports += Import("${className.canonicalName}.$memberName", `as`) } @@ -428,7 +434,7 @@ public class FileSpec private constructor( */ public fun addKotlinDefaultImports( includeJvm: Boolean = true, - includeJs: Boolean = true + includeJs: Boolean = true, ): Builder = apply { defaultImports += KOTLIN_DEFAULT_IMPORTS if (includeJvm) { @@ -519,7 +525,7 @@ public class FileSpec private constructor( for (annotationSpec in annotations) { if (annotationSpec.useSiteTarget != FILE) { error( - "Use-site target ${annotationSpec.useSiteTarget} not supported for file annotations." + "Use-site target ${annotationSpec.useSiteTarget} not supported for file annotations.", ) } } diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/FunSpec.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/FunSpec.kt index 2982321e..2aa75ffc 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/FunSpec.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/FunSpec.kt @@ -37,7 +37,7 @@ public class FunSpec private constructor( builder: Builder, private val tagMap: TagMap = builder.buildTagMap(), private val delegateOriginatingElementsHolder: OriginatingElementsHolder = builder.buildOriginatingElements(), - private val contextReceivers: ContextReceivers = builder.buildContextReceivers() + private val contextReceivers: ContextReceivers = builder.buildContextReceivers(), ) : Taggable by tagMap, OriginatingElementsHolder by delegateOriginatingElementsHolder, ContextReceivable by contextReceivers { public val name: String = builder.name public val kdoc: CodeBlock = builder.kdoc.build() @@ -84,7 +84,7 @@ public class FunSpec private constructor( codeWriter: CodeWriter, enclosingName: String?, implicitModifiers: Set<KModifier>, - includeKdocTags: Boolean = false + includeKdocTags: Boolean = false, ) { if (includeKdocTags) { codeWriter.emitKdoc(kdocWithTags()) @@ -174,7 +174,7 @@ public class FunSpec private constructor( if (delegateConstructor != null) { codeWriter.emitCode( delegateConstructorArguments - .joinToCode(prefix = " : $delegateConstructor(", suffix = ")") + .joinToCode(prefix = " : $delegateConstructor(", suffix = ")"), ) } } @@ -277,7 +277,7 @@ public class FunSpec private constructor( codeWriter = this, enclosingName = "Constructor", implicitModifiers = TypeSpec.Kind.CLASS.implicitFunctionModifiers(), - includeKdocTags = true + includeKdocTags = true, ) } @@ -303,7 +303,7 @@ public class FunSpec private constructor( } public class Builder internal constructor( - internal val name: String + internal val name: String, ) : Taggable.Builder<Builder>, OriginatingElementsHolder.Builder<Builder>, ContextReceivable.Builder<Builder> { internal val kdoc = CodeBlock.builder() internal var returnKdoc = CodeBlock.EMPTY @@ -393,7 +393,7 @@ public class FunSpec private constructor( @JvmOverloads public fun receiver( receiverType: TypeName, - kdoc: CodeBlock = CodeBlock.EMPTY + kdoc: CodeBlock = CodeBlock.EMPTY, ): Builder = apply { check(!name.isConstructor) { "$name cannot have receiver type" } this.receiverType = receiverType @@ -402,29 +402,29 @@ public class FunSpec private constructor( @JvmOverloads public fun receiver( receiverType: Type, - kdoc: CodeBlock = CodeBlock.EMPTY + kdoc: CodeBlock = CodeBlock.EMPTY, ): Builder = receiver(receiverType.asTypeName(), kdoc) public fun receiver( receiverType: Type, kdoc: String, - vararg args: Any + vararg args: Any, ): Builder = receiver(receiverType, CodeBlock.of(kdoc, args)) @JvmOverloads public fun receiver( receiverType: KClass<*>, - kdoc: CodeBlock = CodeBlock.EMPTY + kdoc: CodeBlock = CodeBlock.EMPTY, ): Builder = receiver(receiverType.asTypeName(), kdoc) public fun receiver( receiverType: KClass<*>, kdoc: String, - vararg args: Any + vararg args: Any, ): Builder = receiver(receiverType, CodeBlock.of(kdoc, args)) @JvmOverloads public fun returns( returnType: TypeName, - kdoc: CodeBlock = CodeBlock.EMPTY + kdoc: CodeBlock = CodeBlock.EMPTY, ): Builder = apply { check(!name.isConstructor && !name.isAccessor) { "$name cannot have a return type" } this.returnType = returnType @@ -439,7 +439,7 @@ public class FunSpec private constructor( @JvmOverloads public fun returns( returnType: KClass<*>, - kdoc: CodeBlock = CodeBlock.EMPTY + kdoc: CodeBlock = CodeBlock.EMPTY, ): Builder = returns(returnType.asTypeName(), kdoc) public fun returns(returnType: KClass<*>, kdoc: String, vararg args: Any): Builder = @@ -511,7 +511,7 @@ public class FunSpec private constructor( public fun addParameter( name: String, type: KClass<*>, - modifiers: Iterable<KModifier> + modifiers: Iterable<KModifier>, ): Builder = addParameter(name, type.asTypeName(), modifiers) public fun addCode(format: String, vararg args: Any?): Builder = apply { @@ -589,7 +589,7 @@ public class FunSpec private constructor( @DelicateKotlinPoetApi( message = "Element APIs don't give complete information on Kotlin types. Consider using" + - " the kotlinpoet-metadata APIs instead." + " the kotlinpoet-metadata APIs instead.", ) @JvmStatic public fun overriding(method: ExecutableElement): Builder { @@ -597,7 +597,7 @@ public class FunSpec private constructor( require( Modifier.PRIVATE !in modifiers && Modifier.FINAL !in modifiers && - Modifier.STATIC !in modifiers + Modifier.STATIC !in modifiers, ) { "cannot override method with modifiers: $modifiers" } @@ -630,7 +630,7 @@ public class FunSpec private constructor( funBuilder.addAnnotation( AnnotationSpec.builder(Throws::class) .addMember(throwsValueString, *method.thrownTypes.toTypedArray()) - .build() + .build(), ) } @@ -640,13 +640,13 @@ public class FunSpec private constructor( @Deprecated( message = "Element APIs don't give complete information on Kotlin types. Consider using" + " the kotlinpoet-metadata APIs instead.", - level = WARNING + level = WARNING, ) @JvmStatic public fun overriding( method: ExecutableElement, enclosing: DeclaredType, - types: Types + types: Types, ): Builder { val executableType = types.asMemberOf(enclosing, method) as ExecutableType val resolvedParameterTypes = executableType.parameterTypes diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Import.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Import.kt index 28f65aba..59b6b12e 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Import.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Import.kt @@ -17,7 +17,7 @@ package com.squareup.kotlinpoet public data class Import internal constructor( val qualifiedName: String, - val alias: String? = null + val alias: String? = null, ) : Comparable<Import> { private val importString = buildString { diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/KModifier.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/KModifier.kt index 754804af..81d03570 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/KModifier.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/KModifier.kt @@ -23,7 +23,7 @@ import java.util.EnumSet public enum class KModifier( internal val keyword: String, - private vararg val targets: Target + private vararg val targets: Target, ) { // Modifier order defined here: // https://kotlinlang.org/docs/reference/coding-conventions.html#modifiers diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/KOperator.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/KOperator.kt index ba3b7fa6..461a39f2 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/KOperator.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/KOperator.kt @@ -17,7 +17,7 @@ package com.squareup.kotlinpoet public enum class KOperator( internal val operator: String, - internal val functionName: String + internal val functionName: String, ) { UNARY_PLUS("+", "unaryPlus"), PLUS("+", "plus"), diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/LambdaTypeName.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/LambdaTypeName.kt index 2baa8d24..14f0bb1b 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/LambdaTypeName.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/LambdaTypeName.kt @@ -27,7 +27,7 @@ public class LambdaTypeName private constructor( nullable: Boolean = false, public val isSuspending: Boolean = false, annotations: List<AnnotationSpec> = emptyList(), - tags: Map<KClass<*>, Any> = emptyMap() + tags: Map<KClass<*>, Any> = emptyMap(), ) : TypeName(nullable, annotations, TagMap(tags)) { public val parameters: List<ParameterSpec> = parameters.toImmutableList() @@ -42,7 +42,7 @@ public class LambdaTypeName private constructor( override fun copy( nullable: Boolean, annotations: List<AnnotationSpec>, - tags: Map<KClass<*>, Any> + tags: Map<KClass<*>, Any>, ): LambdaTypeName { return copy(nullable, annotations, this.isSuspending, tags) } @@ -51,7 +51,7 @@ public class LambdaTypeName private constructor( nullable: Boolean = this.isNullable, annotations: List<AnnotationSpec> = this.annotations.toList(), suspending: Boolean = this.isSuspending, - tags: Map<KClass<*>, Any> = this.tags.toMap() + tags: Map<KClass<*>, Any> = this.tags.toMap(), ): LambdaTypeName { return LambdaTypeName(receiver, contextReceivers, parameters, returnType, nullable, suspending, annotations, tags) } @@ -85,31 +85,32 @@ public class LambdaTypeName private constructor( public companion object { /** Returns a lambda type with `returnType` and parameters listed in `parameters`. */ - @ExperimentalKotlinPoetApi @JvmStatic public fun get( + @ExperimentalKotlinPoetApi @JvmStatic + public fun get( receiver: TypeName? = null, parameters: List<ParameterSpec> = emptyList(), returnType: TypeName, - contextReceivers: List<TypeName> = emptyList() + contextReceivers: List<TypeName> = emptyList(), ): LambdaTypeName = LambdaTypeName(receiver, contextReceivers, parameters, returnType) /** Returns a lambda type with `returnType` and parameters listed in `parameters`. */ @JvmStatic public fun get( receiver: TypeName? = null, parameters: List<ParameterSpec> = emptyList(), - returnType: TypeName + returnType: TypeName, ): LambdaTypeName = LambdaTypeName(receiver, emptyList(), parameters, returnType) /** Returns a lambda type with `returnType` and parameters listed in `parameters`. */ @JvmStatic public fun get( receiver: TypeName? = null, vararg parameters: TypeName = emptyArray(), - returnType: TypeName + returnType: TypeName, ): LambdaTypeName { return LambdaTypeName( receiver, emptyList(), parameters.toList().map { ParameterSpec.unnamed(it) }, - returnType + returnType, ) } @@ -117,7 +118,7 @@ public class LambdaTypeName private constructor( @JvmStatic public fun get( receiver: TypeName? = null, vararg parameters: ParameterSpec = emptyArray(), - returnType: TypeName + returnType: TypeName, ): LambdaTypeName = LambdaTypeName(receiver, emptyList(), parameters.toList(), returnType) } } diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/LineWrapper.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/LineWrapper.kt index 6e102c9e..83a155b0 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/LineWrapper.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/LineWrapper.kt @@ -25,7 +25,7 @@ import java.io.Closeable internal class LineWrapper( private val out: Appendable, private val indent: String, - private val columnLimit: Int + private val columnLimit: Int, ) : Closeable { private var closed = false diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/MemberName.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/MemberName.kt index bc0561b7..c70a10ac 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/MemberName.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/MemberName.kt @@ -78,34 +78,34 @@ public data class MemberName internal constructor( public constructor( packageName: String, - simpleName: String + simpleName: String, ) : this(packageName, enclosingClassName = null, simpleName) public constructor( packageName: String, simpleName: String, - isExtension: Boolean + isExtension: Boolean, ) : this(packageName, enclosingClassName = null, simpleName, operator = null, isExtension) public constructor( enclosingClassName: ClassName, - simpleName: String + simpleName: String, ) : this(enclosingClassName.packageName, enclosingClassName, simpleName) public constructor( enclosingClassName: ClassName, simpleName: String, - isExtension: Boolean + isExtension: Boolean, ) : this(enclosingClassName.packageName, enclosingClassName, simpleName, operator = null, isExtension) public constructor( packageName: String, - operator: KOperator + operator: KOperator, ) : this(packageName, enclosingClassName = null, operator.functionName, operator) public constructor( enclosingClassName: ClassName, - operator: KOperator + operator: KOperator, ) : this(enclosingClassName.packageName, enclosingClassName, operator.functionName, operator) /** Fully qualified name using `.` as a separator, like `kotlin.String.isBlank`. */ @@ -146,14 +146,19 @@ public data class MemberName internal constructor( public companion object { @Suppress("NOTHING_TO_INLINE") - @JvmSynthetic @JvmStatic public inline fun ClassName.member(simpleName: String): MemberName = + @JvmSynthetic + @JvmStatic + public inline fun ClassName.member(simpleName: String): MemberName = MemberName(this, simpleName) - @JvmStatic @JvmName("get") public fun KClass<*>.member(simpleName: String): MemberName = + + @JvmStatic + @JvmName("get") + public fun KClass<*>.member(simpleName: String): MemberName = asClassName().member(simpleName) @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) @JvmStatic @JvmName("get") diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/NameAllocator.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/NameAllocator.kt index 8c39cab5..cda10042 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/NameAllocator.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/NameAllocator.kt @@ -75,7 +75,7 @@ import java.util.UUID */ public class NameAllocator private constructor( private val allocatedNames: MutableSet<String>, - private val tagToName: MutableMap<Any, String> + private val tagToName: MutableMap<Any, String>, ) { public constructor() : this(mutableSetOf(), mutableMapOf()) @@ -86,7 +86,7 @@ public class NameAllocator private constructor( */ @JvmOverloads public fun newName( suggestion: String, - tag: Any = UUID.randomUUID().toString() + tag: Any = UUID.randomUUID().toString(), ): String { var result = toJavaIdentifier(suggestion) while (result.isKeyword || !allocatedNames.add(result)) { diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/OriginatingElementsHolder.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/OriginatingElementsHolder.kt index 72356968..27008213 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/OriginatingElementsHolder.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/OriginatingElementsHolder.kt @@ -45,5 +45,5 @@ internal fun List<Element>.buildOriginatingElements() = @JvmInline internal value class OriginatingElements( - override val originatingElements: List<Element> + override val originatingElements: List<Element>, ) : OriginatingElementsHolder diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ParameterSpec.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ParameterSpec.kt index 30101350..9c33ecd9 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ParameterSpec.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ParameterSpec.kt @@ -28,7 +28,7 @@ import kotlin.reflect.KClass /** A generated parameter declaration. */ public class ParameterSpec private constructor( builder: Builder, - private val tagMap: TagMap = builder.buildTagMap() + private val tagMap: TagMap = builder.buildTagMap(), ) : Taggable by tagMap { public val name: String = builder.name public val kdoc: CodeBlock = builder.kdoc.build() @@ -55,7 +55,7 @@ public class ParameterSpec private constructor( codeWriter: CodeWriter, includeType: Boolean = true, emitKdoc: Boolean = false, - inlineAnnotations: Boolean = true + inlineAnnotations: Boolean = true, ) { if (emitKdoc) codeWriter.emitKdoc(kdoc.ensureEndsWithNewLine()) codeWriter.emitAnnotations(annotations, inlineAnnotations) @@ -95,7 +95,7 @@ public class ParameterSpec private constructor( public class Builder internal constructor( internal val name: String, - internal val type: TypeName + internal val type: TypeName, ) : Taggable.Builder<Builder> { internal var defaultValue: CodeBlock? = null @@ -141,7 +141,7 @@ public class ParameterSpec private constructor( @Deprecated( "There are no jvm modifiers applicable to parameters in Kotlin", ReplaceWith(""), - level = ERROR + level = ERROR, ) public fun jvmModifiers(modifiers: Iterable<Modifier>): Builder = apply { throw IllegalArgumentException("JVM modifiers are not permitted on parameters in Kotlin") @@ -160,7 +160,7 @@ public class ParameterSpec private constructor( public companion object { @DelicateKotlinPoetApi( message = "Element APIs don't give complete information on Kotlin types. Consider using" + - " the kotlinpoet-metadata APIs instead." + " the kotlinpoet-metadata APIs instead.", ) @JvmStatic public fun get(element: VariableElement): ParameterSpec { @@ -172,7 +172,7 @@ public class ParameterSpec private constructor( @DelicateKotlinPoetApi( message = "Element APIs don't give complete information on Kotlin types. Consider using" + - " the kotlinpoet-metadata APIs instead." + " the kotlinpoet-metadata APIs instead.", ) @JvmStatic public fun parametersOf(method: ExecutableElement): List<ParameterSpec> = @@ -181,7 +181,7 @@ public class ParameterSpec private constructor( @JvmStatic public fun builder( name: String, type: TypeName, - vararg modifiers: KModifier + vararg modifiers: KModifier, ): Builder { return Builder(name, type).addModifiers(*modifiers) } @@ -192,13 +192,13 @@ public class ParameterSpec private constructor( @JvmStatic public fun builder( name: String, type: KClass<*>, - vararg modifiers: KModifier + vararg modifiers: KModifier, ): Builder = builder(name, type.asTypeName(), *modifiers) @JvmStatic public fun builder( name: String, type: TypeName, - modifiers: Iterable<KModifier> + modifiers: Iterable<KModifier>, ): Builder { return Builder(name, type).addModifiers(modifiers) } @@ -206,13 +206,13 @@ public class ParameterSpec private constructor( @JvmStatic public fun builder( name: String, type: Type, - modifiers: Iterable<KModifier> + modifiers: Iterable<KModifier>, ): Builder = builder(name, type.asTypeName(), modifiers) @JvmStatic public fun builder( name: String, type: KClass<*>, - modifiers: Iterable<KModifier> + modifiers: Iterable<KModifier>, ): Builder = builder(name, type.asTypeName(), modifiers) @JvmStatic public fun unnamed(type: KClass<*>): ParameterSpec = unnamed(type.asTypeName()) @@ -229,7 +229,7 @@ private val ALLOWED_PARAMETER_MODIFIERS = setOf(VARARG, NOINLINE, CROSSINLINE) internal fun List<ParameterSpec>.emit( codeWriter: CodeWriter, forceNewLines: Boolean = false, - emitBlock: (ParameterSpec) -> Unit = { it.emit(codeWriter) } + emitBlock: (ParameterSpec) -> Unit = { it.emit(codeWriter) }, ) = with(codeWriter) { emit("(") diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ParameterizedTypeName.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ParameterizedTypeName.kt index fee91816..ffbcf388 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ParameterizedTypeName.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/ParameterizedTypeName.kt @@ -32,7 +32,7 @@ public class ParameterizedTypeName internal constructor( typeArguments: List<TypeName>, nullable: Boolean = false, annotations: List<AnnotationSpec> = emptyList(), - tags: Map<KClass<*>, Any> = emptyMap() + tags: Map<KClass<*>, Any> = emptyMap(), ) : TypeName(nullable, annotations, TagMap(tags)) { public val typeArguments: List<TypeName> = typeArguments.toImmutableList() @@ -45,7 +45,7 @@ public class ParameterizedTypeName internal constructor( override fun copy( nullable: Boolean, annotations: List<AnnotationSpec>, - tags: Map<KClass<*>, Any> + tags: Map<KClass<*>, Any>, ): ParameterizedTypeName { return ParameterizedTypeName(enclosingType, rawType, typeArguments, nullable, annotations, tags) } @@ -54,15 +54,18 @@ public class ParameterizedTypeName internal constructor( nullable: Boolean = this.isNullable, annotations: List<AnnotationSpec> = this.annotations, tags: Map<KClass<*>, Any> = this.tags, - typeArguments: List<TypeName> = this.typeArguments + typeArguments: List<TypeName> = this.typeArguments, ): ParameterizedTypeName { return ParameterizedTypeName(enclosingType, rawType, typeArguments, nullable, annotations, tags) } public fun plusParameter(typeArgument: TypeName): ParameterizedTypeName = ParameterizedTypeName( - enclosingType, rawType, typeArguments + typeArgument, isNullable, - annotations + enclosingType, + rawType, + typeArguments + typeArgument, + isNullable, + annotations, ) public fun plusParameter(typeArgument: KClass<*>): ParameterizedTypeName = @@ -102,77 +105,99 @@ public class ParameterizedTypeName internal constructor( public companion object { /** Returns a parameterized type, applying `typeArguments` to `this`. */ - @JvmStatic @JvmName("get") public fun ClassName.parameterizedBy( - vararg typeArguments: TypeName + @JvmStatic + @JvmName("get") + public fun ClassName.parameterizedBy( + vararg typeArguments: TypeName, ): ParameterizedTypeName = ParameterizedTypeName(null, this, typeArguments.toList()) /** Returns a parameterized type, applying `typeArguments` to `this`. */ - @JvmStatic @JvmName("get") public fun KClass<*>.parameterizedBy( - vararg typeArguments: KClass<*> + @JvmStatic + @JvmName("get") + public fun KClass<*>.parameterizedBy( + vararg typeArguments: KClass<*>, ): ParameterizedTypeName = ParameterizedTypeName(null, asClassName(), typeArguments.map { it.asTypeName() }) /** Returns a parameterized type, applying `typeArguments` to `this`. */ - @JvmStatic @JvmName("get") public fun Class<*>.parameterizedBy( - vararg typeArguments: Type + @JvmStatic + @JvmName("get") + public fun Class<*>.parameterizedBy( + vararg typeArguments: Type, ): ParameterizedTypeName = ParameterizedTypeName(null, asClassName(), typeArguments.map { it.asTypeName() }) /** Returns a parameterized type, applying `typeArguments` to `this`. */ - @JvmStatic @JvmName("get") public fun ClassName.parameterizedBy( - typeArguments: List<TypeName> + @JvmStatic + @JvmName("get") + public fun ClassName.parameterizedBy( + typeArguments: List<TypeName>, ): ParameterizedTypeName = ParameterizedTypeName(null, this, typeArguments) /** Returns a parameterized type, applying `typeArguments` to `this`. */ - @JvmStatic @JvmName("get") public fun KClass<*>.parameterizedBy( - typeArguments: Iterable<KClass<*>> + @JvmStatic + @JvmName("get") + public fun KClass<*>.parameterizedBy( + typeArguments: Iterable<KClass<*>>, ): ParameterizedTypeName = ParameterizedTypeName(null, asClassName(), typeArguments.map { it.asTypeName() }) /** Returns a parameterized type, applying `typeArguments` to `this`. */ - @JvmStatic @JvmName("get") public fun Class<*>.parameterizedBy( - typeArguments: Iterable<Type> + @JvmStatic + @JvmName("get") + public fun Class<*>.parameterizedBy( + typeArguments: Iterable<Type>, ): ParameterizedTypeName = ParameterizedTypeName(null, asClassName(), typeArguments.map { it.asTypeName() }) /** Returns a parameterized type, applying `typeArgument` to `this`. */ - @JvmStatic @JvmName("get") public fun ClassName.plusParameter( - typeArgument: TypeName + @JvmStatic + @JvmName("get") + public fun ClassName.plusParameter( + typeArgument: TypeName, ): ParameterizedTypeName = parameterizedBy(typeArgument) /** Returns a parameterized type, applying `typeArgument` to `this`. */ - @JvmStatic @JvmName("get") public fun KClass<*>.plusParameter( - typeArgument: KClass<*> + @JvmStatic + @JvmName("get") + public fun KClass<*>.plusParameter( + typeArgument: KClass<*>, ): ParameterizedTypeName = parameterizedBy(typeArgument) /** Returns a parameterized type, applying `typeArgument` to `this`. */ - @JvmStatic @JvmName("get") public fun Class<*>.plusParameter( - typeArgument: Class<*> + @JvmStatic + @JvmName("get") + public fun Class<*>.plusParameter( + typeArgument: Class<*>, ): ParameterizedTypeName = parameterizedBy(typeArgument) /** Returns a parameterized type equivalent to `type`. */ internal fun get( type: ParameterizedType, - map: MutableMap<Type, TypeVariableName> + map: MutableMap<Type, TypeVariableName>, ): ParameterizedTypeName { val rawType = (type.rawType as Class<*>).asClassName() val ownerType = if (type.ownerType is ParameterizedType && !Modifier.isStatic((type.rawType as Class<*>).modifiers) - ) - type.ownerType as ParameterizedType else + ) { + type.ownerType as ParameterizedType + } else { null + } val typeArguments = type.actualTypeArguments.map { get(it, map = map) } - return if (ownerType != null) - get(ownerType, map = map).nestedClass(rawType.simpleName, typeArguments) else + return if (ownerType != null) { + get(ownerType, map = map).nestedClass(rawType.simpleName, typeArguments) + } else { ParameterizedTypeName(null, rawType, typeArguments) + } } /** Returns a type name equivalent to type with given list of type arguments. */ internal fun get( type: KClass<*>, nullable: Boolean, - typeArguments: List<KTypeProjection> + typeArguments: List<KTypeProjection>, ): TypeName { if (typeArguments.isEmpty()) { return type.asTypeName().run { if (nullable) copy(nullable = true) else this } @@ -196,7 +221,7 @@ public class ParameterizedTypeName internal constructor( } }, nullable, - effectiveType.annotations.map { AnnotationSpec.get(it) } + effectiveType.annotations.map { AnnotationSpec.get(it) }, ) } } @@ -205,7 +230,7 @@ public class ParameterizedTypeName internal constructor( /** Returns a parameterized type equivalent to `type`. */ @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) @JvmName("get") public fun ParameterizedType.asParameterizedTypeName(): ParameterizedTypeName = diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/PropertySpec.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/PropertySpec.kt index ffb79e41..8fb58602 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/PropertySpec.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/PropertySpec.kt @@ -49,7 +49,7 @@ public class PropertySpec private constructor( typeVariables.none { it.isReified } || (getter != null || setter != null) && (getter == null || KModifier.INLINE in getter.modifiers) && - (setter == null || KModifier.INLINE in setter.modifiers) + (setter == null || KModifier.INLINE in setter.modifiers), ) { "only type parameters of properties with inline getters and/or setters can be reified!" } @@ -70,7 +70,7 @@ public class PropertySpec private constructor( withInitializer: Boolean = true, emitKdoc: Boolean = true, inline: Boolean = false, - inlineAnnotations: Boolean = inline + inlineAnnotations: Boolean = inline, ) { val isInlineProperty = getter?.modifiers?.contains(KModifier.INLINE) ?: false && (!mutable || setter?.modifiers?.contains(KModifier.INLINE) ?: false) @@ -103,7 +103,7 @@ public class PropertySpec private constructor( val initializerFormat = if (initializer.hasStatements()) "%L" else "«%L»" codeWriter.emitCode( codeBlock = CodeBlock.of(initializerFormat, initializer), - isConstantContext = KModifier.CONST in modifiers + isConstantContext = KModifier.CONST in modifiers, ) } codeWriter.emitWhereBlock(typeVariables) @@ -173,7 +173,7 @@ public class PropertySpec private constructor( public class Builder internal constructor( internal val name: String, - internal val type: TypeName + internal val type: TypeName, ) : Taggable.Builder<Builder>, OriginatingElementsHolder.Builder<Builder>, ContextReceivable.Builder<Builder> { @@ -220,7 +220,7 @@ public class PropertySpec private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) public fun addAnnotation(annotation: Class<*>): Builder = addAnnotation(annotation.asClassName()) @@ -276,7 +276,7 @@ public class PropertySpec private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) public fun receiver(receiverType: Type): Builder = receiver(receiverType.asTypeName()) @@ -286,7 +286,7 @@ public class PropertySpec private constructor( if (KModifier.INLINE in modifiers) { throw IllegalArgumentException( "KotlinPoet doesn't allow setting the inline modifier on " + - "properties. You should mark either the getter, the setter, or both inline." + "properties. You should mark either the getter, the setter, or both inline.", ) } for (it in modifiers) { @@ -300,7 +300,7 @@ public class PropertySpec private constructor( @JvmStatic public fun builder( name: String, type: TypeName, - vararg modifiers: KModifier + vararg modifiers: KModifier, ): Builder { return Builder(name, type).addModifiers(*modifiers) } @@ -311,32 +311,32 @@ public class PropertySpec private constructor( @JvmStatic public fun builder( name: String, type: KClass<*>, - vararg modifiers: KModifier + vararg modifiers: KModifier, ): Builder = builder(name, type.asTypeName(), *modifiers) @JvmStatic public fun builder( name: String, type: TypeName, - modifiers: Iterable<KModifier> + modifiers: Iterable<KModifier>, ): Builder { return Builder(name, type).addModifiers(modifiers) } @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) @JvmStatic public fun builder( name: String, type: Type, - modifiers: Iterable<KModifier> + modifiers: Iterable<KModifier>, ): Builder = builder(name, type.asTypeName(), modifiers) @JvmStatic public fun builder( name: String, type: KClass<*>, - modifiers: Iterable<KModifier> + modifiers: Iterable<KModifier>, ): Builder = builder(name, type.asTypeName(), modifiers) } } diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeAliasSpec.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeAliasSpec.kt index 21307e49..a0a90e2e 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeAliasSpec.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeAliasSpec.kt @@ -25,7 +25,7 @@ import kotlin.reflect.KClass /** A generated typealias declaration */ public class TypeAliasSpec private constructor( builder: Builder, - private val tagMap: TagMap = builder.buildTagMap() + private val tagMap: TagMap = builder.buildTagMap(), ) : Taggable by tagMap { public val name: String = builder.name public val type: TypeName = builder.type @@ -68,7 +68,7 @@ public class TypeAliasSpec private constructor( public class Builder internal constructor( internal val name: String, - internal val type: TypeName + internal val type: TypeName, ) : Taggable.Builder<Builder> { internal val kdoc = CodeBlock.builder() @@ -119,7 +119,7 @@ public class TypeAliasSpec private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) public fun addAnnotation(annotation: Class<*>): Builder = addAnnotation(annotation.asClassName()) @@ -146,7 +146,7 @@ public class TypeAliasSpec private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) @JvmStatic public fun builder(name: String, type: Type): Builder = diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeName.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeName.kt index d6af6926..bffcf4f1 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeName.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeName.kt @@ -65,7 +65,7 @@ import kotlin.reflect.typeOf public sealed class TypeName constructor( public val isNullable: Boolean, annotations: List<AnnotationSpec>, - internal val tagMap: TagMap + internal val tagMap: TagMap, ) : Taggable by tagMap { public val annotations: List<AnnotationSpec> = annotations.toImmutableList() @@ -80,7 +80,7 @@ public sealed class TypeName constructor( public fun copy( nullable: Boolean = this.isNullable, - annotations: List<AnnotationSpec> = this.annotations.toList() + annotations: List<AnnotationSpec> = this.annotations.toList(), ): TypeName { return copy(nullable, annotations, this.tags) } @@ -88,7 +88,7 @@ public sealed class TypeName constructor( public abstract fun copy( nullable: Boolean = this.isNullable, annotations: List<AnnotationSpec> = this.annotations.toList(), - tags: Map<KClass<*>, Any> = this.tags + tags: Map<KClass<*>, Any> = this.tags, ): TypeName public val isAnnotated: Boolean get() = annotations.isNotEmpty() @@ -122,7 +122,7 @@ public sealed class TypeName constructor( public companion object { internal fun get( mirror: TypeMirror, - typeVariables: Map<TypeParameterElement, TypeVariableName> + typeVariables: Map<TypeParameterElement, TypeVariableName>, ): TypeName { return mirror.accept( object : SimpleTypeVisitor7<TypeName, Void?>() { @@ -145,9 +145,11 @@ public sealed class TypeName constructor( val enclosingType = t.enclosingType val enclosing = if (enclosingType.kind != TypeKind.NONE && Modifier.STATIC !in t.asElement().modifiers - ) - enclosingType.accept(this, null) else + ) { + enclosingType.accept(this, null) + } else { null + } if (t.typeArguments.isEmpty() && enclosing !is ParameterizedTypeName) { return rawType } @@ -156,9 +158,11 @@ public sealed class TypeName constructor( for (typeArgument in t.typeArguments) { typeArgumentNames += get(typeArgument, typeVariables) } - return if (enclosing is ParameterizedTypeName) - enclosing.nestedClass(rawType.simpleName, typeArgumentNames) else + return if (enclosing is ParameterizedTypeName) { + enclosing.nestedClass(rawType.simpleName, typeArgumentNames) + } else { ParameterizedTypeName(null, rawType, typeArgumentNames) + } } override fun visitError(t: ErrorType, p: Void?): TypeName { @@ -171,7 +175,7 @@ public sealed class TypeName constructor( override fun visitTypeVariable( t: javax.lang.model.type.TypeVariable, - p: Void? + p: Void?, ): TypeName { return TypeVariableName.get(t, typeVariables.toMutableMap()) } @@ -189,7 +193,7 @@ public sealed class TypeName constructor( throw IllegalArgumentException("Unexpected type mirror: " + e!!) } }, - null + null, ) } @@ -219,53 +223,99 @@ public sealed class TypeName constructor( } @JvmField public val ANY: ClassName = ClassName("kotlin", "Any") + @JvmField public val ARRAY: ClassName = ClassName("kotlin", "Array") + @JvmField public val UNIT: ClassName = ClassName("kotlin", "Unit") + @JvmField public val BOOLEAN: ClassName = ClassName("kotlin", "Boolean") + @JvmField public val BYTE: ClassName = ClassName("kotlin", "Byte") + @JvmField public val SHORT: ClassName = ClassName("kotlin", "Short") + @JvmField public val INT: ClassName = ClassName("kotlin", "Int") + @JvmField public val LONG: ClassName = ClassName("kotlin", "Long") + @JvmField public val CHAR: ClassName = ClassName("kotlin", "Char") + @JvmField public val FLOAT: ClassName = ClassName("kotlin", "Float") + @JvmField public val DOUBLE: ClassName = ClassName("kotlin", "Double") + @JvmField public val STRING: ClassName = ClassName("kotlin", "String") + @JvmField public val CHAR_SEQUENCE: ClassName = ClassName("kotlin", "CharSequence") + @JvmField public val COMPARABLE: ClassName = ClassName("kotlin", "Comparable") + @JvmField public val THROWABLE: ClassName = ClassName("kotlin", "Throwable") + @JvmField public val ANNOTATION: ClassName = ClassName("kotlin", "Annotation") + @JvmField public val NOTHING: ClassName = ClassName("kotlin", "Nothing") + @JvmField public val NUMBER: ClassName = ClassName("kotlin", "Number") + @JvmField public val ITERABLE: ClassName = ClassName("kotlin.collections", "Iterable") + @JvmField public val COLLECTION: ClassName = ClassName("kotlin.collections", "Collection") + @JvmField public val LIST: ClassName = ClassName("kotlin.collections", "List") + @JvmField public val SET: ClassName = ClassName("kotlin.collections", "Set") + @JvmField public val MAP: ClassName = ClassName("kotlin.collections", "Map") + @JvmField public val MAP_ENTRY: ClassName = MAP.nestedClass("Entry") + @JvmField public val MUTABLE_ITERABLE: ClassName = ClassName("kotlin.collections", "MutableIterable") + @JvmField public val MUTABLE_COLLECTION: ClassName = ClassName("kotlin.collections", "MutableCollection") + @JvmField public val MUTABLE_LIST: ClassName = ClassName("kotlin.collections", "MutableList") + @JvmField public val MUTABLE_SET: ClassName = ClassName("kotlin.collections", "MutableSet") + @JvmField public val MUTABLE_MAP: ClassName = ClassName("kotlin.collections", "MutableMap") + @JvmField public val MUTABLE_MAP_ENTRY: ClassName = MUTABLE_MAP.nestedClass("Entry") + @JvmField public val BOOLEAN_ARRAY: ClassName = ClassName("kotlin", "BooleanArray") + @JvmField public val BYTE_ARRAY: ClassName = ClassName("kotlin", "ByteArray") + @JvmField public val CHAR_ARRAY: ClassName = ClassName("kotlin", "CharArray") + @JvmField public val SHORT_ARRAY: ClassName = ClassName("kotlin", "ShortArray") + @JvmField public val INT_ARRAY: ClassName = ClassName("kotlin", "IntArray") + @JvmField public val LONG_ARRAY: ClassName = ClassName("kotlin", "LongArray") + @JvmField public val FLOAT_ARRAY: ClassName = ClassName("kotlin", "FloatArray") + @JvmField public val DOUBLE_ARRAY: ClassName = ClassName("kotlin", "DoubleArray") + @JvmField public val ENUM: ClassName = ClassName("kotlin", "Enum") + @JvmField public val U_BYTE: ClassName = ClassName("kotlin", "UByte") + @JvmField public val U_SHORT: ClassName = ClassName("kotlin", "UShort") + @JvmField public val U_INT: ClassName = ClassName("kotlin", "UInt") + @JvmField public val U_LONG: ClassName = ClassName("kotlin", "ULong") + @JvmField public val U_BYTE_ARRAY: ClassName = ClassName("kotlin", "UByteArray") + @JvmField public val U_SHORT_ARRAY: ClassName = ClassName("kotlin", "UShortArray") + @JvmField public val U_INT_ARRAY: ClassName = ClassName("kotlin", "UIntArray") + @JvmField public val U_LONG_ARRAY: ClassName = ClassName("kotlin", "ULongArray") /** The wildcard type `*` which is shorthand for `out Any?`. */ @@ -277,7 +327,7 @@ public sealed class TypeName constructor( /** Returns a [TypeName] equivalent to this [TypeMirror]. */ @DelicateKotlinPoetApi( message = "Mirror APIs don't give complete information on Kotlin types. Consider using" + - " the kotlinpoet-metadata APIs instead." + " the kotlinpoet-metadata APIs instead.", ) @JvmName("get") public fun TypeMirror.asTypeName(): TypeName = TypeName.get(this, mutableMapOf()) diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeSpec.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeSpec.kt index d0a2cfd2..ad751c54 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeSpec.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeSpec.kt @@ -41,7 +41,7 @@ public class TypeSpec private constructor( private val delegateOriginatingElements: OriginatingElementsHolder = builder.originatingElements .plus(builder.typeSpecs.flatMap(TypeSpec::originatingElements)) .buildOriginatingElements(), - private val contextReceivers: ContextReceivers = builder.buildContextReceivers() + private val contextReceivers: ContextReceivers = builder.buildContextReceivers(), ) : Taggable by tagMap, OriginatingElementsHolder by delegateOriginatingElements, ContextReceivable by contextReceivers { public val kind: Kind = builder.kind public val name: String? = builder.name @@ -101,7 +101,7 @@ public class TypeSpec private constructor( codeWriter: CodeWriter, enumName: String?, implicitModifiers: Set<KModifier> = emptySet(), - isNestedExternal: Boolean = false + isNestedExternal: Boolean = false, ) { // Types. val areNestedExternal = EXTERNAL in modifiers || isNestedExternal @@ -129,7 +129,6 @@ public class TypeSpec private constructor( } codeWriter.emit(" {\n") } else if (isAnonymousClass) { - codeWriter.emitCode("object") val supertype = if (superclass != ANY) { if (!areNestedExternal && !modifiers.contains(EXPECT)) { @@ -141,9 +140,11 @@ public class TypeSpec private constructor( listOf() } - val allSuperTypes = supertype + if (superinterfaces.isNotEmpty()) - superinterfaces.keys.map { CodeBlock.of(" %T", it) } else + val allSuperTypes = supertype + if (superinterfaces.isNotEmpty()) { + superinterfaces.keys.map { CodeBlock.of(" %T", it) } + } else { emptyList() + } if (allSuperTypes.isNotEmpty()) { codeWriter.emitCode(" :") @@ -160,7 +161,7 @@ public class TypeSpec private constructor( codeWriter.emitAnnotations(annotationSpecs, false) codeWriter.emitModifiers( modifiers, - if (isNestedExternal) setOf(PUBLIC, EXTERNAL) else setOf(PUBLIC) + if (isNestedExternal) setOf(PUBLIC, EXTERNAL) else setOf(PUBLIC), ) codeWriter.emit(kind.declarationKeyword) if (name != null) { @@ -191,8 +192,11 @@ public class TypeSpec private constructor( val property = constructorProperties[param.name] if (property != null) { property.emit( - codeWriter, setOf(PUBLIC), withInitializer = false, inline = true, - inlineAnnotations = false + codeWriter, + setOf(PUBLIC), + withInitializer = false, + inline = true, + inlineAnnotations = false, ) param.emitDefaultValue(codeWriter) } else { @@ -337,8 +341,9 @@ public class TypeSpec private constructor( if (property.getter != null || property.setter != null) continue val parameter = primaryConstructor.parameter(property.name) ?: continue if (parameter.type != property.type) continue - if (!isPropertyInitializerConstructorParameter(property, parameter)) + if (!isPropertyInitializerConstructorParameter(property, parameter)) { continue + } result[property.name] = property.fromPrimaryConstructorParameter(parameter) } @@ -350,7 +355,7 @@ public class TypeSpec private constructor( */ private fun isPropertyInitializerConstructorParameter( property: PropertySpec, - parameter: ParameterSpec + parameter: ParameterSpec, ): Boolean { val parameterName = CodeBlock.of("%N", parameter).toString() val initializerCode = property.initializer.toString().escapeIfNecessary(validate = false) @@ -418,7 +423,7 @@ public class TypeSpec private constructor( internal val declarationKeyword: String, internal val defaultImplicitPropertyModifiers: Set<KModifier>, internal val defaultImplicitFunctionModifiers: Set<KModifier>, - internal val defaultImplicitTypeModifiers: Set<KModifier> + internal val defaultImplicitTypeModifiers: Set<KModifier>, ) { CLASS("class", setOf(PUBLIC), setOf(PUBLIC), setOf()), OBJECT("object", setOf(PUBLIC), setOf(PUBLIC), setOf()), @@ -454,7 +459,7 @@ public class TypeSpec private constructor( public class Builder internal constructor( internal var kind: Kind, internal val name: String?, - vararg modifiers: KModifier + vararg modifiers: KModifier, ) : Taggable.Builder<Builder>, OriginatingElementsHolder.Builder<Builder>, ContextReceivable.Builder<Builder> { internal val kdoc = CodeBlock.builder() internal var primaryConstructor: FunSpec? = null @@ -473,6 +478,7 @@ public class TypeSpec private constructor( override val tags: MutableMap<KClass<*>, Any> = mutableMapOf() override val originatingElements: MutableList<Element> = mutableListOf() + @ExperimentalKotlinPoetApi override val contextReceiverTypes: MutableList<TypeName> = mutableListOf() public val modifiers: MutableSet<KModifier> = mutableSetOf(*modifiers) @@ -506,7 +512,7 @@ public class TypeSpec private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) public fun addAnnotation(annotation: Class<*>): Builder = addAnnotation(annotation.asClassName()) @@ -576,7 +582,7 @@ public class TypeSpec private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) public fun superclass(superclass: Type): Builder = superclass(superclass.asTypeName()) @@ -584,7 +590,7 @@ public class TypeSpec private constructor( public fun addSuperclassConstructorParameter( format: String, - vararg args: Any + vararg args: Any, ): Builder = apply { addSuperclassConstructorParameter(CodeBlock.of(format, *args)) } @@ -600,7 +606,7 @@ public class TypeSpec private constructor( public fun addSuperinterface( superinterface: TypeName, - delegate: CodeBlock = CodeBlock.EMPTY + delegate: CodeBlock = CodeBlock.EMPTY, ): Builder = apply { if (delegate.isEmpty()) { this.superinterfaces[superinterface] = null @@ -621,26 +627,26 @@ public class TypeSpec private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) public fun addSuperinterface( superinterface: Type, - delegate: CodeBlock = CodeBlock.EMPTY + delegate: CodeBlock = CodeBlock.EMPTY, ): Builder = addSuperinterface(superinterface.asTypeName(), delegate) public fun addSuperinterface( superinterface: KClass<*>, - delegate: CodeBlock = CodeBlock.EMPTY + delegate: CodeBlock = CodeBlock.EMPTY, ): Builder = addSuperinterface(superinterface.asTypeName(), delegate) public fun addSuperinterface( superinterface: KClass<*>, - constructorParameterName: String + constructorParameterName: String, ): Builder = addSuperinterface(superinterface.asTypeName(), constructorParameterName) public fun addSuperinterface( superinterface: TypeName, - constructorParameter: String + constructorParameter: String, ): Builder = apply { requireNotNull(primaryConstructor) { "delegating to constructor parameter requires not-null constructor" @@ -654,7 +660,7 @@ public class TypeSpec private constructor( @JvmOverloads public fun addEnumConstant( name: String, - typeSpec: TypeSpec = anonymousClassBuilder().build() + typeSpec: TypeSpec = anonymousClassBuilder().build(), ): Builder = apply { require(name != "name" && name != "ordinal") { "constant with name \"$name\" conflicts with a supertype member with the same name" @@ -688,7 +694,7 @@ public class TypeSpec private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) public fun addProperty(name: String, type: Type, vararg modifiers: KModifier): Builder = addProperty(name, type.asTypeName(), *modifiers) @@ -701,7 +707,7 @@ public class TypeSpec private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) public fun addProperty(name: String, type: Type, modifiers: Iterable<KModifier>): Builder = addProperty(name, type.asTypeName(), modifiers) @@ -863,7 +869,8 @@ public class TypeSpec private constructor( @JvmStatic public fun objectBuilder(className: ClassName): Builder = objectBuilder(className.simpleName) - @JvmStatic @JvmOverloads public fun companionObjectBuilder(name: String? = null): Builder = + @JvmStatic @JvmOverloads + public fun companionObjectBuilder(name: String? = null): Builder = Builder(Kind.OBJECT, name, COMPANION) @JvmStatic public fun interfaceBuilder(name: String): Builder = Builder(Kind.INTERFACE, name) diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeVariableName.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeVariableName.kt index 726350e8..b2d7517a 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeVariableName.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/TypeVariableName.kt @@ -36,13 +36,13 @@ public class TypeVariableName private constructor( public val isReified: Boolean = false, nullable: Boolean = false, annotations: List<AnnotationSpec> = emptyList(), - tags: Map<KClass<*>, Any> = emptyMap() + tags: Map<KClass<*>, Any> = emptyMap(), ) : TypeName(nullable, annotations, TagMap(tags)) { override fun copy( nullable: Boolean, annotations: List<AnnotationSpec>, - tags: Map<KClass<*>, Any> + tags: Map<KClass<*>, Any>, ): TypeVariableName { return copy(nullable, annotations, this.bounds, this.isReified, tags) } @@ -52,11 +52,16 @@ public class TypeVariableName private constructor( annotations: List<AnnotationSpec> = this.annotations.toList(), bounds: List<TypeName> = this.bounds.toList(), reified: Boolean = this.isReified, - tags: Map<KClass<*>, Any> = this.tagMap.tags + tags: Map<KClass<*>, Any> = this.tagMap.tags, ): TypeVariableName { return TypeVariableName( - name, bounds.withoutImplicitBound(), variance, reified, nullable, - annotations, tags + name, + bounds.withoutImplicitBound(), + variance, + reified, + nullable, + annotations, + tags, ) } @@ -70,7 +75,7 @@ public class TypeVariableName private constructor( internal fun of( name: String, bounds: List<TypeName>, - variance: KModifier? + variance: KModifier?, ): TypeVariableName { require(variance == null || variance.isOneOf(KModifier.IN, KModifier.OUT)) { "$variance is an invalid variance modifier, the only allowed values are in and out!" @@ -83,81 +88,95 @@ public class TypeVariableName private constructor( } /** Returns type variable named `name` with `variance` and without bounds. */ - @JvmStatic @JvmName("get") @JvmOverloads + @JvmStatic + @JvmName("get") + @JvmOverloads public operator fun invoke(name: String, variance: KModifier? = null): TypeVariableName = of(name = name, bounds = NULLABLE_ANY_LIST, variance = variance) /** Returns type variable named `name` with `variance` and `bounds`. */ - @JvmStatic @JvmName("get") @JvmOverloads + @JvmStatic + @JvmName("get") + @JvmOverloads public operator fun invoke( name: String, vararg bounds: TypeName, - variance: KModifier? = null + variance: KModifier? = null, ): TypeVariableName = of( name = name, bounds = bounds.toList().ifEmpty(::NULLABLE_ANY_LIST), - variance = variance + variance = variance, ) /** Returns type variable named `name` with `variance` and `bounds`. */ - @JvmStatic @JvmName("get") @JvmOverloads + @JvmStatic + @JvmName("get") + @JvmOverloads public operator fun invoke( name: String, vararg bounds: KClass<*>, - variance: KModifier? = null + variance: KModifier? = null, ): TypeVariableName = of( name = name, bounds = bounds.map(KClass<*>::asTypeName).ifEmpty(::NULLABLE_ANY_LIST), - variance = variance + variance = variance, ) /** Returns type variable named `name` with `variance` and `bounds`. */ - @JvmStatic @JvmName("get") @JvmOverloads + @JvmStatic + @JvmName("get") + @JvmOverloads public operator fun invoke( name: String, vararg bounds: Type, - variance: KModifier? = null + variance: KModifier? = null, ): TypeVariableName = of( name = name, bounds = bounds.map(Type::asTypeName).ifEmpty(::NULLABLE_ANY_LIST), - variance = variance + variance = variance, ) /** Returns type variable named `name` with `variance` and `bounds`. */ - @JvmStatic @JvmName("get") @JvmOverloads + @JvmStatic + @JvmName("get") + @JvmOverloads public operator fun invoke( name: String, bounds: List<TypeName>, - variance: KModifier? = null + variance: KModifier? = null, ): TypeVariableName = of(name, bounds.ifEmpty(::NULLABLE_ANY_LIST), variance) /** Returns type variable named `name` with `variance` and `bounds`. */ - @JvmStatic @JvmName("getWithClasses") @JvmOverloads + @JvmStatic + @JvmName("getWithClasses") + @JvmOverloads public operator fun invoke( name: String, bounds: Iterable<KClass<*>>, - variance: KModifier? = null + variance: KModifier? = null, ): TypeVariableName = of( name, bounds.map { it.asTypeName() }.ifEmpty(::NULLABLE_ANY_LIST), - variance + variance, ) /** Returns type variable named `name` with `variance` and `bounds`. */ - @JvmStatic @JvmName("getWithTypes") @JvmOverloads + @JvmStatic + @JvmName("getWithTypes") + @JvmOverloads public operator fun invoke( name: String, bounds: Iterable<Type>, - variance: KModifier? = null + variance: KModifier? = null, ): TypeVariableName = of( name, bounds.map { it.asTypeName() }.ifEmpty(::NULLABLE_ANY_LIST), - variance + variance, ) /** @@ -170,7 +189,7 @@ public class TypeVariableName private constructor( */ internal fun get( mirror: javax.lang.model.type.TypeVariable, - typeVariables: MutableMap<TypeParameterElement, TypeVariableName> + typeVariables: MutableMap<TypeParameterElement, TypeVariableName>, ): TypeVariableName { val element = mirror.asElement() as TypeParameterElement var typeVariableName: TypeVariableName? = typeVariables[element] @@ -196,7 +215,7 @@ public class TypeVariableName private constructor( /** Returns type variable equivalent to `type`. */ internal fun get( type: java.lang.reflect.TypeVariable<*>, - map: MutableMap<Type, TypeVariableName> = mutableMapOf() + map: MutableMap<Type, TypeVariableName> = mutableMapOf(), ): TypeVariableName { var result: TypeVariableName? = map[type] if (result == null) { @@ -224,7 +243,7 @@ public class TypeVariableName private constructor( /** Returns type variable equivalent to `mirror`. */ @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider using" + - " the kotlinpoet-metadata APIs instead." + " the kotlinpoet-metadata APIs instead.", ) @JvmName("get") public fun TypeVariable.asTypeVariableName(): TypeVariableName = @@ -233,7 +252,7 @@ public fun TypeVariable.asTypeVariableName(): TypeVariableName = /** Returns type variable equivalent to `element`. */ @DelicateKotlinPoetApi( message = "Element APIs don't give complete information on Kotlin types. Consider using" + - " the kotlinpoet-metadata APIs instead." + " the kotlinpoet-metadata APIs instead.", ) @JvmName("get") public fun TypeParameterElement.asTypeVariableName(): TypeVariableName { @@ -252,6 +271,6 @@ public fun KTypeParameter.asTypeVariableName(): TypeVariableName { KVariance.INVARIANT -> null KVariance.IN -> KModifier.IN KVariance.OUT -> KModifier.OUT - } + }, ) } diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Util.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Util.kt index cebb46cc..3a5bdf88 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Util.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/Util.kt @@ -80,7 +80,7 @@ private val Char.isIsoControl: Boolean internal fun stringLiteralWithQuotes( value: String, escapeDollarSign: Boolean = true, - isConstantContext: Boolean = false + isConstantContext: Boolean = false, ): String { if (!isConstantContext && '\n' in value) { val result = StringBuilder(value.length + 32) diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/WildcardTypeName.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/WildcardTypeName.kt index 914df5a5..f7c4dc0c 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/WildcardTypeName.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/WildcardTypeName.kt @@ -27,7 +27,7 @@ public class WildcardTypeName private constructor( inTypes: List<TypeName>, nullable: Boolean = false, annotations: List<AnnotationSpec> = emptyList(), - tags: Map<KClass<*>, Any> = emptyMap() + tags: Map<KClass<*>, Any> = emptyMap(), ) : TypeName(nullable, annotations, TagMap(tags)) { public val outTypes: List<TypeName> = outTypes.toImmutableList() public val inTypes: List<TypeName> = inTypes.toImmutableList() @@ -39,7 +39,7 @@ public class WildcardTypeName private constructor( override fun copy( nullable: Boolean, annotations: List<AnnotationSpec>, - tags: Map<KClass<*>, Any> + tags: Map<KClass<*>, Any>, ): WildcardTypeName { return WildcardTypeName(outTypes, inTypes, nullable, annotations, tags) } @@ -63,7 +63,7 @@ public class WildcardTypeName private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) @JvmStatic public fun producerOf(outType: Type): WildcardTypeName = @@ -81,7 +81,7 @@ public class WildcardTypeName private constructor( @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider " + - "using the kotlinpoet-metadata APIs instead." + "using the kotlinpoet-metadata APIs instead.", ) @JvmStatic public fun consumerOf(inType: Type): WildcardTypeName = @@ -92,7 +92,7 @@ public class WildcardTypeName private constructor( internal fun get( mirror: javax.lang.model.type.WildcardType, - typeVariables: Map<TypeParameterElement, TypeVariableName> + typeVariables: Map<TypeParameterElement, TypeVariableName>, ): TypeName { val outType = mirror.extendsBound return if (outType == null) { @@ -109,11 +109,11 @@ public class WildcardTypeName private constructor( internal fun get( wildcardName: WildcardType, - map: MutableMap<Type, TypeVariableName> + map: MutableMap<Type, TypeVariableName>, ): TypeName { return WildcardTypeName( wildcardName.upperBounds.map { get(it, map = map) }, - wildcardName.lowerBounds.map { get(it, map = map) } + wildcardName.lowerBounds.map { get(it, map = map) }, ) } } @@ -121,7 +121,7 @@ public class WildcardTypeName private constructor( @DelicateKotlinPoetApi( message = "Mirror APIs don't give complete information on Kotlin types. Consider using" + - " the kotlinpoet-metadata APIs instead." + " the kotlinpoet-metadata APIs instead.", ) @JvmName("get") public fun javax.lang.model.type.WildcardType.asWildcardTypeName(): TypeName = @@ -129,7 +129,7 @@ public fun javax.lang.model.type.WildcardType.asWildcardTypeName(): TypeName = @DelicateKotlinPoetApi( message = "Java reflection APIs don't give complete information on Kotlin types. Consider using" + - " the kotlinpoet-metadata APIs instead." + " the kotlinpoet-metadata APIs instead.", ) @JvmName("get") public fun WildcardType.asWildcardTypeName(): TypeName = diff --git a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/jvm/JvmAnnotations.kt b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/jvm/JvmAnnotations.kt index ac732dc6..6f18620e 100644 --- a/kotlinpoet/src/main/java/com/squareup/kotlinpoet/jvm/JvmAnnotations.kt +++ b/kotlinpoet/src/main/java/com/squareup/kotlinpoet/jvm/JvmAnnotations.kt @@ -34,13 +34,13 @@ public fun FileSpec.Builder.jvmName(name: String): FileSpec.Builder = addAnnotat AnnotationSpec.builder(JvmName::class) .useSiteTarget(FILE) .addMember("%S", name) - .build() + .build(), ) public fun FileSpec.Builder.jvmMultifileClass(): FileSpec.Builder = addAnnotation( AnnotationSpec.builder(JvmMultifileClass::class) .useSiteTarget(FILE) - .build() + .build(), ) public fun TypeSpec.Builder.jvmSuppressWildcards(suppress: Boolean = true): TypeSpec.Builder = @@ -72,7 +72,7 @@ public fun FunSpec.Builder.jvmName(name: String): FunSpec.Builder = apply { addAnnotation( AnnotationSpec.builder(JvmName::class) .addMember("%S", name) - .build() + .build(), ) } @@ -89,7 +89,7 @@ public fun FunSpec.Builder.throws(exceptionClasses: Iterable<TypeName>): FunSpec addAnnotation( AnnotationSpec.builder(Throws::class) .apply { exceptionClasses.forEach { addMember("%T::class", it) } } - .build() + .build(), ) public fun FunSpec.Builder.jvmSuppressWildcards(suppress: Boolean = true): FunSpec.Builder = apply { @@ -112,7 +112,7 @@ public fun PropertySpec.Builder.jvmField(): PropertySpec.Builder = addAnnotation public fun PropertySpec.Builder.jvmStatic(): PropertySpec.Builder = addAnnotation(JvmStatic::class) public fun PropertySpec.Builder.jvmSuppressWildcards( - suppress: Boolean = true + suppress: Boolean = true, ): PropertySpec.Builder = addAnnotation(jvmSuppressWildcardsAnnotation(suppress)) public fun PropertySpec.Builder.transient(): PropertySpec.Builder = addAnnotation(Transient::class) diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotatedTypeNameTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotatedTypeNameTest.kt index 564e3c34..3e7b766c 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotatedTypeNameTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotatedTypeNameTest.kt @@ -50,7 +50,7 @@ class AnnotatedTypeNameTest { val actual = type .copy( annotations = type.annotations + NEVER_NULL + - AnnotationSpec.builder(Override::class).build() + AnnotationSpec.builder(Override::class).build(), ) .toString() assertEquals(expected, actual) @@ -98,17 +98,17 @@ class AnnotatedTypeNameTest { assertEquals(type, type) assertEquals( type.copy(annotations = listOf(NEVER_NULL)), - type.copy(annotations = listOf(NEVER_NULL)) + type.copy(annotations = listOf(NEVER_NULL)), ) assertNotEquals(type, type.copy(annotations = listOf(NEVER_NULL))) assertEquals(type.hashCode().toLong(), type.hashCode().toLong()) assertEquals( type.copy(annotations = listOf(NEVER_NULL)).hashCode().toLong(), - type.copy(annotations = listOf(NEVER_NULL)).hashCode().toLong() + type.copy(annotations = listOf(NEVER_NULL)).hashCode().toLong(), ) assertNotEquals( type.hashCode().toLong(), - type.copy(annotations = listOf(NEVER_NULL)).hashCode().toLong() + type.copy(annotations = listOf(NEVER_NULL)).hashCode().toLong(), ) } @@ -117,7 +117,8 @@ class AnnotatedTypeNameTest { annotation class TypeUseAnnotation // https://github.com/square/javapoet/issues/431 - @Ignore @Test fun annotatedNestedType() { + @Ignore @Test + fun annotatedNestedType() { val expected = "kotlin.collections.Map.@" + TypeUseAnnotation::class.java.canonicalName + " Entry" val typeUseAnnotation = AnnotationSpec.builder(TypeUseAnnotation::class).build() val type = Map.Entry::class.asTypeName().copy(annotations = listOf(typeUseAnnotation)) @@ -126,7 +127,8 @@ class AnnotatedTypeNameTest { } // https://github.com/square/javapoet/issues/431 - @Ignore @Test fun annotatedNestedParameterizedType() { + @Ignore @Test + fun annotatedNestedParameterizedType() { val expected = "kotlin.collections.Map.@" + TypeUseAnnotation::class.java.canonicalName + " Entry<kotlin.Byte, kotlin.Byte>" val typeUseAnnotation = AnnotationSpec.builder(TypeUseAnnotation::class).build() diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotationSpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotationSpecTest.kt index e27555df..e2f60be4 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotationSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AnnotationSpecTest.kt @@ -64,7 +64,7 @@ class AnnotationSpecTest { val o: Breakfast, val p: Int, val q: AnnotationC = AnnotationC("foo"), - val r: Array<KClass<out Number>> = [Byte::class, Short::class, Int::class, Long::class] + val r: Array<KClass<out Number>> = [Byte::class, Short::class, Int::class, Long::class], ) @HasDefaultsAnnotation( @@ -75,11 +75,12 @@ class AnnotationSpecTest { l = Override::class, j = AnnotationA(), q = AnnotationC("bar"), - r = [Float::class, Double::class] + r = [Float::class, Double::class], ) inner class IsAnnotated - @Rule @JvmField val compilation = CompilationRule() + @Rule @JvmField + val compilation = CompilationRule() @Test fun equalsAndHashCode() { var a = AnnotationSpec.builder(AnnotationC::class.java).build() @@ -118,7 +119,7 @@ class AnnotationSpecTest { |) |public class Taco | - """.trimMargin() + """.trimMargin(), ) } @@ -149,7 +150,7 @@ class AnnotationSpecTest { |) |public class IsAnnotated | - """.trimMargin() + """.trimMargin(), ) } @@ -160,7 +161,7 @@ class AnnotationSpecTest { "" + "@com.squareup.kotlinpoet.AnnotationSpecTest.HasDefaultsAnnotation(" + "n = []" + - ")" + ")", ) builder.addMember("%L = %L", "m", "[]") assertThat(builder.build().toString()).isEqualTo( @@ -168,7 +169,7 @@ class AnnotationSpecTest { "@com.squareup.kotlinpoet.AnnotationSpecTest.HasDefaultsAnnotation(" + "n = [], " + "m = []" + - ")" + ")", ) } @@ -196,7 +197,7 @@ class AnnotationSpecTest { |) |public class Taco | - """.trimMargin() + """.trimMargin(), ) } @@ -235,7 +236,7 @@ class AnnotationSpecTest { |) |public class Taco | - """.trimMargin() + """.trimMargin(), ) } @@ -243,22 +244,22 @@ class AnnotationSpecTest { val builder = AnnotationSpec.builder(AnnotationA::class) assertThat(builder.build().toString()).isEqualTo( "" + - "@com.squareup.kotlinpoet.AnnotationSpecTest.AnnotationA" + "@com.squareup.kotlinpoet.AnnotationSpecTest.AnnotationA", ) builder.useSiteTarget(AnnotationSpec.UseSiteTarget.FIELD) assertThat(builder.build().toString()).isEqualTo( "" + - "@field:com.squareup.kotlinpoet.AnnotationSpecTest.AnnotationA" + "@field:com.squareup.kotlinpoet.AnnotationSpecTest.AnnotationA", ) builder.useSiteTarget(AnnotationSpec.UseSiteTarget.GET) assertThat(builder.build().toString()).isEqualTo( "" + - "@get:com.squareup.kotlinpoet.AnnotationSpecTest.AnnotationA" + "@get:com.squareup.kotlinpoet.AnnotationSpecTest.AnnotationA", ) builder.useSiteTarget(null) assertThat(builder.build().toString()).isEqualTo( "" + - "@com.squareup.kotlinpoet.AnnotationSpecTest.AnnotationA" + "@com.squareup.kotlinpoet.AnnotationSpecTest.AnnotationA", ) } @@ -270,7 +271,7 @@ class AnnotationSpecTest { assertThat(annotation.toString()).isEqualTo( "" + - "@kotlin.Deprecated(\"Nope\", kotlin.ReplaceWith(\"Yep\"))" + "@kotlin.Deprecated(\"Nope\", kotlin.ReplaceWith(\"Yep\"))", ) } @@ -284,7 +285,7 @@ class AnnotationSpecTest { assertThat(builder.build().toString()).isEqualTo( "" + - "@kotlin.Deprecated(\"Nope\", kotlin.ReplaceWith(\"Nope\"))" + "@kotlin.Deprecated(\"Nope\", kotlin.ReplaceWith(\"Nope\"))", ) } @@ -295,7 +296,7 @@ class AnnotationSpecTest { assertThat(builder.build().toString()).isEqualTo( "" + - "@kotlin.Deprecated(\"This is a long string with a newline\\nin the middle.\")" + "@kotlin.Deprecated(\"This is a long string with a newline\\nin the middle.\")", ) } @@ -309,7 +310,7 @@ class AnnotationSpecTest { FunSpec.builder("test") .addStatement("%L", annotationSpec) .addStatement("val annotatedString = %S", "AnnotatedString") - .build() + .build(), ) .build() assertThat(file.toString().trim()).isEqualTo( @@ -323,7 +324,7 @@ class AnnotationSpecTest { | @Suppress("Things") | val annotatedString = "AnnotatedString" |} - """.trimMargin() + """.trimMargin(), ) } @@ -341,7 +342,7 @@ class AnnotationSpecTest { |public fun operation(): kotlin.Unit { | @Suppress("UNCHECKED_CAST") |} - """.trimMargin() + """.trimMargin(), ) } @@ -367,7 +368,7 @@ class AnnotationSpecTest { | Boolean::class)) |public class Result | - """.trimMargin() + """.trimMargin(), ) } @@ -395,13 +396,13 @@ class AnnotationSpecTest { | |@AnnotationSpecTest.AnnotationWithArrayValue(value = arrayOf(Object::class, Boolean::class)) |public class Result - """.trimMargin() + """.trimMargin(), ) } @Test fun getOnValueArrayTypeAnnotationShouldNameValueArg() { val annotation = JavaClassWithArrayValueAnnotation::class.java.getAnnotation( - JavaClassWithArrayValueAnnotation.AnnotationWithArrayValue::class.java + JavaClassWithArrayValueAnnotation.AnnotationWithArrayValue::class.java, ) val classBuilder = TypeSpec.classBuilder("Result") .addAnnotation(AnnotationSpec.get(annotation)) @@ -417,7 +418,7 @@ class AnnotationSpecTest { |@JavaClassWithArrayValueAnnotation.AnnotationWithArrayValue(value = arrayOf(Object::class, | Boolean::class)) |public class Result - """.trimMargin() + """.trimMargin(), ) } @@ -437,7 +438,7 @@ class AnnotationSpecTest { | |@AnnotationSpecTest.AnnotationWithArrayValue(value = arrayOf(Object::class, Boolean::class)) |public class Result - """.trimMargin() + """.trimMargin(), ) } @@ -454,12 +455,12 @@ class AnnotationSpecTest { .addProperty( PropertySpec.builder("value", Int::class) .initializer("value") - .build() + .build(), ) .primaryConstructor( FunSpec.constructorBuilder() .addParameter("value", Int::class) - .build() + .build(), ) .build() val externalClassParceler = ClassName("com.squareup.parceler", "ExternalClassParceler") @@ -467,14 +468,14 @@ class AnnotationSpecTest { val externalClassParcelerSpec = TypeSpec.objectBuilder(externalClassParceler) .addSuperinterface( ClassName("com.squareup.parceler", "Parceler") - .parameterizedBy(externalClass) + .parameterizedBy(externalClass), ) .addFunction( FunSpec.builder("create") .addModifiers(OVERRIDE) .addParameter("parcel", parcel) .addStatement("return %T(parcel.readInt())", externalClass) - .build() + .build(), ) .addFunction( FunSpec.builder("write") @@ -483,7 +484,7 @@ class AnnotationSpecTest { .addParameter("parcel", parcel) .addParameter("flags", Int::class) .addStatement("parcel.writeInt(value)") - .build() + .build(), ) .build() val parcelize = ClassName("com.squareup.parceler", "Parcelize") @@ -491,7 +492,7 @@ class AnnotationSpecTest { val typeParcelerAnnotation = AnnotationSpec.builder( typeParceler .plusParameter(externalClass) - .plusParameter(externalClassParceler) + .plusParameter(externalClassParceler), ) .build() val classLocalParceler = TypeSpec.classBuilder("MyClass") @@ -500,12 +501,12 @@ class AnnotationSpecTest { .addProperty( PropertySpec.builder("external", externalClass) .initializer("external") - .build() + .build(), ) .primaryConstructor( FunSpec.constructorBuilder() .addParameter("external", externalClass) - .build() + .build(), ) .build() val propertyLocalParceler = TypeSpec.classBuilder("MyClass") @@ -514,12 +515,12 @@ class AnnotationSpecTest { PropertySpec.builder("external", externalClass) .addAnnotation(typeParcelerAnnotation) .initializer("external") - .build() + .build(), ) .primaryConstructor( FunSpec.constructorBuilder() .addParameter("external", externalClass) - .build() + .build(), ) .build() val writeWith = ClassName("com.squareup.parceler", "WriteWith") @@ -528,20 +529,20 @@ class AnnotationSpecTest { annotations = listOf( AnnotationSpec .builder(writeWith.plusParameter(externalClassParceler)) - .build() - ) + .build(), + ), ) val typeLocalParceler = TypeSpec.classBuilder("MyClass") .addAnnotation(parcelize) .addProperty( PropertySpec.builder("external", writeWithExternalClass) .initializer("external") - .build() + .build(), ) .primaryConstructor( FunSpec.constructorBuilder() .addParameter("external", writeWithExternalClass) - .build() + .build(), ) .build() val file = FileSpec.builder("com.squareup.parceler", "Test") @@ -588,7 +589,7 @@ class AnnotationSpecTest { public val `external`: @WriteWith<ExternalClassParceler> ExternalClass, ) - """.trimIndent() + """.trimIndent(), ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/assertions.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AssertThrows.kt index facd7022..facd7022 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/assertions.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/AssertThrows.kt diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CodeBlockTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CodeBlockTest.kt index a3c70265..5d2e6bec 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CodeBlockTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CodeBlockTest.kt @@ -76,7 +76,7 @@ class CodeBlockTest { .addNamed("\"I like \" + %text:S + \". Do you like \" + %text:S + \"?\"", map) .build() assertThat(block.toString()).isEqualTo( - "\"I like \" + \"tacos\" + \". Do you like \" + \"tacos\" + \"?\"" + "\"I like \" + \"tacos\" + \". Do you like \" + \"tacos\" + \"?\"", ) } @@ -113,7 +113,7 @@ class CodeBlockTest { .build() assertThat(block.toString()).isEqualTo( - "java.lang.System.out.println(\"Let's eat some tacos\");" + "java.lang.System.out.println(\"Let's eat some tacos\");", ) } @@ -202,7 +202,7 @@ class CodeBlockTest { |- Format parts: [«, print(, «, %L, », ), \n, »] |- Arguments: [1 + 1] | - """.trimMargin() + """.trimMargin(), ) } @@ -221,7 +221,7 @@ class CodeBlockTest { |- Format parts: [«, print(, %L, », ), \n, »] |- Arguments: [1 + 1] | - """.trimMargin() + """.trimMargin(), ) } @@ -251,47 +251,47 @@ class CodeBlockTest { @Test fun withoutPrefixMatching() { assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("")) + .withoutPrefix(CodeBlock.of("")), ) .isEqualTo(CodeBlock.of("abcd %S efgh %S ijkl", "x", "y")) assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("ab")) + .withoutPrefix(CodeBlock.of("ab")), ) .isEqualTo(CodeBlock.of("cd %S efgh %S ijkl", "x", "y")) assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("abcd ")) + .withoutPrefix(CodeBlock.of("abcd ")), ) .isEqualTo(CodeBlock.of("%S efgh %S ijkl", "x", "y")) assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("abcd %S", "x")) + .withoutPrefix(CodeBlock.of("abcd %S", "x")), ) .isEqualTo(CodeBlock.of(" efgh %S ijkl", "y")) assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("abcd %S ef", "x")) + .withoutPrefix(CodeBlock.of("abcd %S ef", "x")), ) .isEqualTo(CodeBlock.of("gh %S ijkl", "y")) assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("abcd %S efgh ", "x")) + .withoutPrefix(CodeBlock.of("abcd %S efgh ", "x")), ) .isEqualTo(CodeBlock.of("%S ijkl", "y")) assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("abcd %S efgh %S", "x", "y")) + .withoutPrefix(CodeBlock.of("abcd %S efgh %S", "x", "y")), ) .isEqualTo(CodeBlock.of(" ijkl")) assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("abcd %S efgh %S ij", "x", "y")) + .withoutPrefix(CodeBlock.of("abcd %S efgh %S ij", "x", "y")), ) .isEqualTo(CodeBlock.of("kl")) assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("abcd %S efgh %S ijkl", "x", "y")) + .withoutPrefix(CodeBlock.of("abcd %S efgh %S ijkl", "x", "y")), ) .isEqualTo(CodeBlock.of("")) } @@ -299,47 +299,47 @@ class CodeBlockTest { @Test fun withoutPrefixNoArgs() { assertThat( CodeBlock.of("abcd %% efgh %% ijkl") - .withoutPrefix(CodeBlock.of("")) + .withoutPrefix(CodeBlock.of("")), ) .isEqualTo(CodeBlock.of("abcd %% efgh %% ijkl")) assertThat( CodeBlock.of("abcd %% efgh %% ijkl") - .withoutPrefix(CodeBlock.of("ab")) + .withoutPrefix(CodeBlock.of("ab")), ) .isEqualTo(CodeBlock.of("cd %% efgh %% ijkl")) assertThat( CodeBlock.of("abcd %% efgh %% ijkl") - .withoutPrefix(CodeBlock.of("abcd ")) + .withoutPrefix(CodeBlock.of("abcd ")), ) .isEqualTo(CodeBlock.of("%% efgh %% ijkl")) assertThat( CodeBlock.of("abcd %% efgh %% ijkl") - .withoutPrefix(CodeBlock.of("abcd %%")) + .withoutPrefix(CodeBlock.of("abcd %%")), ) .isEqualTo(CodeBlock.of(" efgh %% ijkl")) assertThat( CodeBlock.of("abcd %% efgh %% ijkl") - .withoutPrefix(CodeBlock.of("abcd %% ef")) + .withoutPrefix(CodeBlock.of("abcd %% ef")), ) .isEqualTo(CodeBlock.of("gh %% ijkl")) assertThat( CodeBlock.of("abcd %% efgh %% ijkl") - .withoutPrefix(CodeBlock.of("abcd %% efgh ")) + .withoutPrefix(CodeBlock.of("abcd %% efgh ")), ) .isEqualTo(CodeBlock.of("%% ijkl")) assertThat( CodeBlock.of("abcd %% efgh %% ijkl") - .withoutPrefix(CodeBlock.of("abcd %% efgh %%")) + .withoutPrefix(CodeBlock.of("abcd %% efgh %%")), ) .isEqualTo(CodeBlock.of(" ijkl")) assertThat( CodeBlock.of("abcd %% efgh %% ijkl") - .withoutPrefix(CodeBlock.of("abcd %% efgh %% ij")) + .withoutPrefix(CodeBlock.of("abcd %% efgh %% ij")), ) .isEqualTo(CodeBlock.of("kl")) assertThat( CodeBlock.of("abcd %% efgh %% ijkl") - .withoutPrefix(CodeBlock.of("abcd %% efgh %% ijkl")) + .withoutPrefix(CodeBlock.of("abcd %% efgh %% ijkl")), ) .isEqualTo(CodeBlock.of("")) } @@ -347,12 +347,12 @@ class CodeBlockTest { @Test fun withoutPrefixArgMismatch() { assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("abcd %S efgh %S ij", "x", "z")) + .withoutPrefix(CodeBlock.of("abcd %S efgh %S ij", "x", "z")), ) .isNull() assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("abcd %S efgh %S ij", "z", "y")) + .withoutPrefix(CodeBlock.of("abcd %S efgh %S ij", "z", "y")), ) .isNull() } @@ -360,12 +360,12 @@ class CodeBlockTest { @Test fun withoutPrefixFormatPartMismatch() { assertThat( CodeBlock.of("abcd %S efgh %S ijkl", "x", "y") - .withoutPrefix(CodeBlock.of("abcd %S efgx %S ij", "x", "y")) + .withoutPrefix(CodeBlock.of("abcd %S efgx %S ij", "x", "y")), ) .isNull() assertThat( CodeBlock.of("abcd %S efgh %% ijkl", "x") - .withoutPrefix(CodeBlock.of("abcd %% efgh %S ij", "x")) + .withoutPrefix(CodeBlock.of("abcd %% efgh %S ij", "x")), ) .isNull() } @@ -373,12 +373,12 @@ class CodeBlockTest { @Test fun withoutPrefixTooShort() { assertThat( CodeBlock.of("abcd %S efgh %S", "x", "y") - .withoutPrefix(CodeBlock.of("abcd %S efgh %S ijkl", "x", "y")) + .withoutPrefix(CodeBlock.of("abcd %S efgh %S ijkl", "x", "y")), ) .isNull() assertThat( CodeBlock.of("abcd %S efgh", "x") - .withoutPrefix(CodeBlock.of("abcd %S efgh %S ijkl", "x", "y")) + .withoutPrefix(CodeBlock.of("abcd %S efgh %S ijkl", "x", "y")), ) .isNull() } @@ -420,7 +420,7 @@ class CodeBlockTest { @Test fun trimMultipleNoArgPlaceholders() { assertThat( - CodeBlock.of("«return if (x > %L) %S else %S»", 1, "a", "b").trim() + CodeBlock.of("«return if (x > %L) %S else %S»", 1, "a", "b").trim(), ) .isEqualTo(CodeBlock.of("return if (x > %L) %S else %S", 1, "a", "b")) } @@ -463,7 +463,7 @@ class CodeBlockTest { | println(element) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -479,7 +479,7 @@ class CodeBlockTest { | println(element) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -499,7 +499,7 @@ class CodeBlockTest { | println("bar") |} | - """.trimMargin() + """.trimMargin(), ) } @@ -510,7 +510,7 @@ class CodeBlockTest { .beginControlFlow("if (%1S == %1S)", "Very long string that would wrap the line ") .nextControlFlow("else if (%1S == %1S)", "Long string that would wrap the line 2 ") .endControlFlow() - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -527,7 +527,7 @@ class CodeBlockTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -544,7 +544,7 @@ class CodeBlockTest { | |Statement with no args | - """.trimMargin() + """.trimMargin(), ) } @@ -593,7 +593,7 @@ class CodeBlockTest { | ) |) | - """.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 63ed06b1..5074b913 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CrossplatformTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/CrossplatformTest.kt @@ -31,31 +31,31 @@ class CrossplatformTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("value", expectTypeParam) - .build() + .build(), ) .addProperty(PropertySpec.builder("value", expectTypeParam).build()) .addFunction( FunSpec.builder("get") .returns(expectTypeParam) - .build() + .build(), ) .addFunction( FunSpec.builder("set") .addParameter("value", expectTypeParam) - .build() + .build(), ) .addFunction( FunSpec.builder("getAndSet") .addParameter("value", expectTypeParam) .returns(expectTypeParam) - .build() + .build(), ) .addFunction( FunSpec.builder("compareAndSet") .addParameter("expect", expectTypeParam) .addParameter("update", expectTypeParam) .returns(Boolean::class) - .build() + .build(), ) .build() val actualName = AtomicReference::class.asTypeName().parameterizedBy(expectTypeParam) @@ -90,7 +90,7 @@ class CrossplatformTest { | |public actual typealias AtomicRef<V> = AtomicReference<V> | - """.trimMargin() + """.trimMargin(), ) } @@ -102,7 +102,7 @@ class CrossplatformTest { .addFunction( FunSpec.constructorBuilder() .addParameter("message", String::class) - .build() + .build(), ) .build() val fileSpec = FileSpec.builder("", "Test") @@ -120,7 +120,7 @@ class CrossplatformTest { | public constructor(message: String) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -130,7 +130,7 @@ class CrossplatformTest { .addProperty( PropertySpec.builder("bar", String::class, KModifier.ACTUAL) .initializer(CodeBlock.of("%S", "Hello")) - .build() + .build(), ) .build() @@ -142,7 +142,7 @@ class CrossplatformTest { | |public actual val bar: String = "Hello" | - """.trimMargin() + """.trimMargin(), ) } @@ -152,13 +152,13 @@ class CrossplatformTest { FunSpec.builder("f1") .addModifiers(KModifier.EXPECT) .returns(Int::class) - .build() + .build(), ) .addFunction( FunSpec.builder("f1") .addModifiers(KModifier.ACTUAL) .addStatement("return 1") - .build() + .build(), ) .build() @@ -170,7 +170,7 @@ class CrossplatformTest { | |public actual fun f1() = 1 | - """.trimMargin() + """.trimMargin(), ) } @@ -187,7 +187,7 @@ class CrossplatformTest { .addFunction( FunSpec.builder("print") .addStatement("println()") - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo("functions in expect classes can't have bodies") @@ -199,7 +199,7 @@ class CrossplatformTest { .addProperty( PropertySpec.builder("a", Boolean::class) .initializer("true") - .build() + .build(), ) }.hasMessageThat().isEqualTo("properties in expect classes can't have initializers") } @@ -212,9 +212,9 @@ class CrossplatformTest { .getter( FunSpec.getterBuilder() .addStatement("return true") - .build() + .build(), ) - .build() + .build(), ) }.hasMessageThat().isEqualTo("properties in expect classes can't have getters and setters") } @@ -229,9 +229,9 @@ class CrossplatformTest { FunSpec.setterBuilder() .addParameter("value", Boolean::class) .addStatement("field = true") - .build() + .build(), ) - .build() + .build(), ) }.hasMessageThat().isEqualTo("properties in expect classes can't have getters and setters") } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/DelegatedConstructorCallTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/DelegatedConstructorCallTest.kt index 7b85e8ff..80a90358 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/DelegatedConstructorCallTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/DelegatedConstructorCallTest.kt @@ -27,7 +27,7 @@ class DelegatedConstructorCallTest { """ |public class Test : testpackage.TestSuper() | - """.trimMargin() + """.trimMargin(), ) } @@ -39,7 +39,7 @@ class DelegatedConstructorCallTest { """ |public object Test : testpackage.TestSuper() | - """.trimMargin() + """.trimMargin(), ) } @@ -52,7 +52,7 @@ class DelegatedConstructorCallTest { """ |public external class Test : testpackage.TestSuper | - """.trimMargin() + """.trimMargin(), ) } @@ -65,7 +65,7 @@ class DelegatedConstructorCallTest { """ |public expect class Test : testpackage.TestSuper | - """.trimMargin() + """.trimMargin(), ) } @@ -78,7 +78,7 @@ class DelegatedConstructorCallTest { """ |public expect object Test : testpackage.TestSuper | - """.trimMargin() + """.trimMargin(), ) } @@ -91,7 +91,7 @@ class DelegatedConstructorCallTest { """ |public external object Test : testpackage.TestSuper | - """.trimMargin() + """.trimMargin(), ) } @@ -104,7 +104,7 @@ class DelegatedConstructorCallTest { """ |public class Test : testpackage.TestSuper(anything) | - """.trimMargin() + """.trimMargin(), ) } @@ -117,7 +117,7 @@ class DelegatedConstructorCallTest { """ |public object Test : testpackage.TestSuper(anything) | - """.trimMargin() + """.trimMargin(), ) } @@ -137,7 +137,7 @@ class DelegatedConstructorCallTest { | 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 b9007519..5cb7753c 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExpectDeclarationsTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExpectDeclarationsTest.kt @@ -28,7 +28,7 @@ class ExpectDeclarationsTest { """ |public expect fun function(): kotlin.Unit | - """.trimMargin() + """.trimMargin(), ) } @@ -45,7 +45,7 @@ class ExpectDeclarationsTest { | public fun function(): kotlin.Unit |} | - """.trimMargin() + """.trimMargin(), ) } @@ -58,7 +58,7 @@ class ExpectDeclarationsTest { """ |expect val prop: kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -75,7 +75,7 @@ class ExpectDeclarationsTest { | 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 b00def65..42719c41 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExternalDeclarationsTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ExternalDeclarationsTest.kt @@ -28,7 +28,7 @@ class ExternalDeclarationsTest { """ |public external fun function(): kotlin.Unit | - """.trimMargin() + """.trimMargin(), ) } @@ -42,7 +42,7 @@ class ExternalDeclarationsTest { """ |public external fun function() = kotlin.js.definedExternally | - """.trimMargin() + """.trimMargin(), ) } @@ -58,7 +58,7 @@ class ExternalDeclarationsTest { | kotlin.js.definedExternally |} | - """.trimMargin() + """.trimMargin(), ) } @@ -75,7 +75,7 @@ class ExternalDeclarationsTest { | public fun function(): kotlin.Unit |} | - """.trimMargin() + """.trimMargin(), ) } @@ -93,7 +93,7 @@ class ExternalDeclarationsTest { | public fun function() = kotlin.js.definedExternally |} | - """.trimMargin() + """.trimMargin(), ) } @@ -114,7 +114,7 @@ class ExternalDeclarationsTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -127,7 +127,7 @@ class ExternalDeclarationsTest { """ |external val prop: kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -141,7 +141,7 @@ class ExternalDeclarationsTest { """ |external val prop: kotlin.String = kotlin.js.definedExternally | - """.trimMargin() + """.trimMargin(), ) } @@ -158,7 +158,7 @@ class ExternalDeclarationsTest { | public val prop: kotlin.String |} | - """.trimMargin() + """.trimMargin(), ) } @@ -176,7 +176,7 @@ class ExternalDeclarationsTest { | 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 fa765823..1ce5f7d7 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileSpecTest.kt @@ -76,7 +76,7 @@ class FileSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -89,14 +89,14 @@ class FileSpecTest { .addStatement("assert %1T.valueOf(\"BLOCKED\") == %1T.BLOCKED", Thread.State::class) .addStatement("%T.gc()", System::class) .addStatement("%1T.out.println(%1T.nanoTime())", System::class) - .build() + .build(), ) .addFunction( FunSpec.constructorBuilder() .addParameter("states", Thread.State::class.asClassName(), VARARG) - .build() + .build(), ) - .build() + .build(), ) .addImport(Thread.State.BLOCKED) .addImport(System::class, "gc", "out", "nanoTime") @@ -123,7 +123,7 @@ class FileSpecTest { | public constructor(vararg states: Thread.State) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -134,10 +134,10 @@ class FileSpecTest { FunSpec.builder("prepareTacos") .returns( List::class.asClassName() - .parameterizedBy(ClassName("com.squareup.tacos", "Taco")) + .parameterizedBy(ClassName("com.squareup.tacos", "Taco")), ) .addCode("return wrap(INGREDIENTS)\n") - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -150,7 +150,7 @@ class FileSpecTest { | |public fun prepareTacos(): List<Taco> = wrap(INGREDIENTS) | - """.trimMargin() + """.trimMargin(), ) } @@ -163,9 +163,9 @@ class FileSpecTest { .addFunction( FunSpec.builder("main") .addStatement("%T.%L.println(%S)", System::class, "out", "hello") - .build() + .build(), ) - .build() + .build(), ) .addImport(System::class, "out") .build() @@ -181,7 +181,7 @@ class FileSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -204,7 +204,7 @@ class FileSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -228,7 +228,7 @@ class FileSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -254,7 +254,7 @@ class FileSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -287,7 +287,7 @@ class FileSpecTest { | |public class Taco | - """.trimMargin() + """.trimMargin(), ) } @@ -296,7 +296,7 @@ class FileSpecTest { .addType( TypeSpec.classBuilder("Taco") .addProperty("madeFreshDate", Date::class) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -309,7 +309,7 @@ class FileSpecTest { | public val madeFreshDate: Date |} | - """.trimMargin() + """.trimMargin(), ) } @@ -318,7 +318,7 @@ class FileSpecTest { .addType( TypeSpec.classBuilder("Taco") .addProperty("madeFreshDate", ClassName("com.squareup.is.fun.in", "Date")) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -331,7 +331,7 @@ class FileSpecTest { | public val madeFreshDate: Date |} | - """.trimMargin() + """.trimMargin(), ) } @@ -343,7 +343,7 @@ class FileSpecTest { |package com.squareup.`taco factory` | | - """.trimMargin() + """.trimMargin(), ) } @@ -353,7 +353,7 @@ class FileSpecTest { TypeSpec.classBuilder("Taco") .addProperty("madeFreshDate", Date::class) .addProperty("madeFreshDatabaseDate", ClassName("java.sql", "Date")) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -368,7 +368,7 @@ class FileSpecTest { | public val madeFreshDatabaseDate: java.sql.Date |} | - """.trimMargin() + """.trimMargin(), ) } @@ -378,7 +378,7 @@ class FileSpecTest { TypeSpec.classBuilder("Taco") .addProperty("madeFreshDate1", ClassName("com.squareup.is.fun.in", "Date")) .addProperty("madeFreshDate2", ClassName("com.squareup.do.val.var", "Date")) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -393,7 +393,7 @@ class FileSpecTest { | public val madeFreshDate2: com.squareup.`do`.`val`.`var`.Date |} | - """.trimMargin() + """.trimMargin(), ) } @@ -403,7 +403,7 @@ class FileSpecTest { .addFunction( FunSpec.builder("main") .addStatement("println(%T.produceTacos())", tacoFactory) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -417,7 +417,7 @@ class FileSpecTest { | println(TacoFactory.produceTacos()) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -428,7 +428,7 @@ class FileSpecTest { .addFunction( FunSpec.builder("main") .addStatement("println(%T.produceTacos())", tacoFactory) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -442,7 +442,7 @@ class FileSpecTest { | println(`La Taqueria`.produceTacos()) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -453,12 +453,12 @@ class FileSpecTest { .addProperty( PropertySpec.builder("a", java.lang.String::class.java) .initializer("%T(%S)", java.lang.String::class.java, "a") - .build() + .build(), ) .addProperty( PropertySpec.builder("b", String::class) .initializer("%S", "b") - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -472,7 +472,7 @@ class FileSpecTest { | |public val b: KString = "b" | - """.trimMargin() + """.trimMargin(), ) } @@ -483,7 +483,7 @@ class FileSpecTest { .addFunction( FunSpec.builder("sleepForFiveMins") .addStatement("%T.MINUTES.sleep(5)", TimeUnit::class) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -497,7 +497,7 @@ class FileSpecTest { | MINS.sleep(5) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -511,19 +511,19 @@ class FileSpecTest { .addType( TypeSpec.classBuilder("C") .addProperty("d", ClassName("com.squareup.tacos", "A", "Twin", "D")) - .build() + .build(), ) - .build() + .build(), ) .addType( TypeSpec.classBuilder("Twin") .addType( TypeSpec.classBuilder("D") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -544,7 +544,7 @@ class FileSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -558,19 +558,19 @@ class FileSpecTest { TypeSpec.classBuilder("C") .addProperty("d", ClassName("com.squareup.tacos", "A", "Twin", "D")) .addType(TypeSpec.classBuilder("Twin").build()) - .build() + .build(), ) - .build() + .build(), ) .addType( TypeSpec.classBuilder("Twin") .addType( TypeSpec.classBuilder("D") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -591,7 +591,7 @@ class FileSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -607,21 +607,21 @@ class FileSpecTest { .addType( TypeSpec.classBuilder("Nested") .addType(TypeSpec.classBuilder("Twin").build()) - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .addType( TypeSpec.classBuilder("Twin") .addType( TypeSpec.classBuilder("D") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -644,7 +644,7 @@ class FileSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -656,9 +656,9 @@ class FileSpecTest { .addType( TypeSpec.classBuilder("Builder") .superclass(ClassName("com.squareup.wire", "Message", "Builder")) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -671,7 +671,7 @@ class FileSpecTest { | public class Builder : Message.Builder() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -684,9 +684,9 @@ class FileSpecTest { .addType( TypeSpec.classBuilder("Builder") .addAnnotation(ClassName("dagger", "Component", "Builder")) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -701,7 +701,7 @@ class FileSpecTest { | public class Builder |} | - """.trimMargin() + """.trimMargin(), ) } @@ -714,9 +714,9 @@ class FileSpecTest { .addModifiers(KModifier.PUBLIC) .addParameter("args", ARRAY.parameterizedBy(String::class.asClassName())) .addCode("%T.out.println(%S);\n", System::class, "Hello World!") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -732,7 +732,7 @@ class FileSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -741,7 +741,7 @@ class FileSpecTest { .addType( TypeSpec.classBuilder("World") .addSuperinterface(ClassName("", "Test")) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -752,7 +752,7 @@ class FileSpecTest { | |public class World : Test | - """.trimMargin() + """.trimMargin(), ) } @@ -768,7 +768,7 @@ class FileSpecTest { | |public class Taco | - """.trimMargin() + """.trimMargin(), ) } @@ -788,7 +788,7 @@ class FileSpecTest { | |public class Taco | - """.trimMargin() + """.trimMargin(), ) } @@ -798,7 +798,7 @@ class FileSpecTest { TypeSpec.classBuilder("Taco") .addProperty("a", ClassName("com.squareup.tacos", "A")) .addType(TypeSpec.classBuilder("A").build()) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -811,7 +811,7 @@ class FileSpecTest { | public class A |} | - """.trimMargin() + """.trimMargin(), ) } @@ -828,7 +828,7 @@ class FileSpecTest { | |public class B | - """.trimMargin() + """.trimMargin(), ) } @@ -838,8 +838,8 @@ class FileSpecTest { .addTypeAlias( TypeAliasSpec.builder( "FileTable", - Map::class.parameterizedBy(String::class, Int::class) - ).build() + Map::class.parameterizedBy(String::class, Int::class), + ).build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -855,7 +855,7 @@ class FileSpecTest { | |public typealias FileTable = Map<String, Int> | - """.trimMargin() + """.trimMargin(), ) } @@ -865,7 +865,7 @@ class FileSpecTest { AnnotationSpec.builder(JvmName::class) .useSiteTarget(FILE) .addMember("%S", "TacoUtils") - .build() + .build(), ) .addAnnotation(JvmMultifileClass::class) .build() @@ -880,7 +880,7 @@ class FileSpecTest { |import kotlin.jvm.JvmName | | - """.trimMargin() + """.trimMargin(), ) } @@ -903,7 +903,7 @@ class FileSpecTest { |package com.squareup.`is`.`fun`.`in` | | - """.trimMargin() + """.trimMargin(), ) } @@ -917,7 +917,7 @@ class FileSpecTest { .addFunction( FunSpec.builder("defaultIngredients") .addCode("println(INGREDIENTS)\n") - .build() + .build(), ) .build() @@ -930,7 +930,7 @@ class FileSpecTest { AnnotationSpec.builder(JvmName::class.asClassName()) .useSiteTarget(FILE) .addMember("name = %S", "JvmTaco") - .build() + .build(), ) val javaWord = AnnotationSpec.builder(JvmName::class.asClassName()) @@ -965,7 +965,7 @@ class FileSpecTest { import com.foo.Foo2 - """.trimIndent() + """.trimIndent(), ) } @@ -1006,9 +1006,9 @@ class FileSpecTest { |val inputBigInt = bigInt(input) |return inputBigInt.add(5) | - """.trimMargin() + """.trimMargin(), ) - .build() + .build(), ) .build() assertThat(spec.toString()).isEqualTo( @@ -1024,7 +1024,7 @@ class FileSpecTest { | return inputBigInt.add(5) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1032,7 +1032,7 @@ class FileSpecTest { val spec = FileSpec.builder("com.squareup.taco.enchilada.quesadillas.tamales.burritos.super.burritos.trying.to.get.a.really.large.packagename", "Test") .addFunction( FunSpec.builder("foo") - .build() + .build(), ) .build() assertThat(spec.toString()).isEqualTo( @@ -1044,7 +1044,7 @@ class FileSpecTest { |public fun foo(): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1059,7 +1059,7 @@ class FileSpecTest { |import a.really.veryveryveryveryveryveryvery.long.pkgname.that.will.definitely.cause.a.wrap.duetoitslength.MyClass | | - """.trimMargin() + """.trimMargin(), ) } @@ -1074,7 +1074,7 @@ class FileSpecTest { |import a.really.veryveryveryveryveryveryvery.long.pkgname.that.will.definitely.cause.a.wrap.duetoitslength.MyClass as MyClassAlias | | - """.trimMargin() + """.trimMargin(), ) } @@ -1082,7 +1082,7 @@ class FileSpecTest { val file = FileSpec.builder("com.squareup.tacos", "Taco") .addFileComment( "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do " + - "eiusmod tempor incididunt ut labore et dolore magna aliqua." + "eiusmod tempor incididunt ut labore et dolore magna aliqua.", ) .build() assertThat(file.toString()).isEqualTo( @@ -1091,7 +1091,7 @@ class FileSpecTest { |package com.squareup.tacos | | - """.trimMargin() + """.trimMargin(), ) } @@ -1106,12 +1106,12 @@ class FileSpecTest { .addFunction( FunSpec.builder("f1") .addComment("this is a long line with a possibly long parameterized type with annotation: %T", someLongParameterizedTypeName) - .build() + .build(), ) .addFunction( FunSpec.builder("f2") .addComment("this is a very very very very very very very very very very long line with a very long lambda type: %T", someLongLambdaTypeName) - .build() + .build(), ) .build() @@ -1134,7 +1134,7 @@ class FileSpecTest { | // 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<Map<in String, Collection<Map<FileSpecTest.WackyKey, out FileSpecTest.OhNoThisDoesNotCompile>>>>) -> String |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1146,7 +1146,7 @@ class FileSpecTest { .addCode("\n") .addFunction( FunSpec.builder("localFun") - .build() + .build(), ) .addCode("\n") .addType(TypeSpec.classBuilder("Yay").build()) @@ -1169,7 +1169,7 @@ class FileSpecTest { | |val yayInstance = Yay() | - """.trimMargin() + """.trimMargin(), ) } @@ -1193,7 +1193,7 @@ class FileSpecTest { |val prop3: @FunctionalInterface Callable<String>? = null |val prop4: @FunctionalInterface Function<Int, Int>? = 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 16c1c8c8..39807095 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileWritingTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FileWritingTest.kt @@ -28,7 +28,8 @@ import org.junit.rules.TemporaryFolder class FileWritingTest { // Used for testing java.io File behavior. - @JvmField @Rule val tmp = TemporaryFolder() + @JvmField @Rule + val tmp = TemporaryFolder() // Used for testing java.nio.file Path behavior. private val fs = Jimfs.newFileSystem(Configuration.unix()) @@ -136,7 +137,8 @@ class FileWritingTest { } @Suppress("LocalVariableName") - @Test fun filerPassesOriginatingElements() { + @Test + fun filerPassesOriginatingElements() { // TypeSpecs val element1_1 = FakeElement() val test1 = TypeSpec.classBuilder("Test1") @@ -203,7 +205,7 @@ class FileWritingTest { element3_1, element3_2, element4_1, - element4_2 + element4_2, ) } @@ -237,7 +239,7 @@ class FileWritingTest { .addModifiers(KModifier.PUBLIC) .addParameter("args", Array<String>::class.java) .addCode("%T.out.println(%S);\n", System::class, "Hello World!") - .build() + .build(), ) .build() FileSpec.builder("foo", "Test") @@ -268,7 +270,7 @@ class FileWritingTest { |${"\t"}} |} | - """.trimMargin() + """.trimMargin(), ) } @@ -291,7 +293,7 @@ class FileWritingTest { | |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 a4bfc3d5..c06c3e96 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FunSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/FunSpecTest.kt @@ -37,7 +37,8 @@ import org.junit.Rule @OptIn(ExperimentalKotlinPoetApi::class) class FunSpecTest { - @Rule @JvmField val compilation = CompilationRule() + @Rule @JvmField + val compilation = CompilationRule() private lateinit var elements: Elements private lateinit var types: Types @@ -59,10 +60,11 @@ class FunSpecTest { internal annotation class Nullable internal abstract class Everything { - @Deprecated("") @Throws(IOException::class, SecurityException::class) + @Deprecated("") + @Throws(IOException::class, SecurityException::class) protected abstract fun <T> everything( @Nullable thing: String, - things: List<T> + things: List<T>, ): Runnable where T : Runnable, T : Closeable } @@ -97,7 +99,7 @@ class FunSpecTest { |protected override fun <T> everything(arg0: java.lang.String, arg1: java.util.List<out T>): java.lang.Runnable where T : java.lang.Runnable, T : java.io.Closeable { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -110,7 +112,7 @@ class FunSpecTest { |public override fun toString(): java.lang.String { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -126,7 +128,7 @@ class FunSpecTest { |public override fun call(): java.lang.Integer { |} | - """.trimMargin() + """.trimMargin(), ) exec = findFirst(methods, "compareTo") funSpec = FunSpec.overriding(exec, classType, types).build() @@ -135,7 +137,7 @@ class FunSpecTest { |public override fun compareTo(arg0: java.lang.Long): kotlin.Int { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -161,7 +163,7 @@ class FunSpecTest { .addParameter( ParameterSpec .builder("string", String::class.asTypeName().copy(nullable = true)) - .build() + .build(), ) .build() assertThat(funSpec.toString()).isEqualTo( @@ -169,7 +171,7 @@ class FunSpecTest { |public fun foo(string: kotlin.String?): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -182,7 +184,7 @@ class FunSpecTest { |public fun foo(): kotlin.String? { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -196,7 +198,7 @@ class FunSpecTest { |public fun foo(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -210,7 +212,7 @@ class FunSpecTest { """ |public fun foo(): kotlin.Unit = bar() | - """.trimMargin() + """.trimMargin(), ) } @@ -228,7 +230,7 @@ class FunSpecTest { codeWriter = it, enclosingName = null, implicitModifiers = setOf(KModifier.PUBLIC), - includeKdocTags = false + includeKdocTags = false, ) } assertThat(sb.toString()).isEqualTo( @@ -238,7 +240,7 @@ class FunSpecTest { | return "Loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong" |} | - """.trimMargin() + """.trimMargin(), ) } @@ -247,12 +249,12 @@ class FunSpecTest { .addParameter( ParameterSpec.builder("string", String::class.asTypeName()) .addKdoc("A string parameter.") - .build() + .build(), ) .addParameter( ParameterSpec.builder("number", Int::class.asTypeName()) .addKdoc("A number with a multi-line doc comment.\nYes,\nthese\nthings\nhappen.") - .build() + .build(), ) .addParameter(ParameterSpec.builder("nodoc", Boolean::class.asTypeName()).build()) .build() @@ -273,7 +275,7 @@ class FunSpecTest { |): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -285,7 +287,7 @@ class FunSpecTest { .build() .toBuilder() .addKdoc(" This is non null") - .build() + .build(), ) .build() assertThat(funSpec.toString()).isEqualTo( @@ -296,7 +298,7 @@ class FunSpecTest { |public fun foo(string: kotlin.String): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -315,7 +317,7 @@ class FunSpecTest { .addParameter( ParameterSpec.builder("string", String::class) .addKdoc("A string parameter.") - .build() + .build(), ) .addParameter(ParameterSpec.builder("nodoc", Boolean::class).build()) .returns(String::class, kdoc = "the foo.") @@ -329,7 +331,7 @@ class FunSpecTest { | */ |public fun foo(string: kotlin.String, nodoc: kotlin.Boolean): kotlin.String = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -349,7 +351,7 @@ class FunSpecTest { | */ |public fun foo(nodoc: kotlin.Boolean): kotlin.String = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -362,7 +364,7 @@ class FunSpecTest { """ |public fun foo(): kotlin.Nothing = throw java.lang.AssertionError() | - """.trimMargin() + """.trimMargin(), ) } @@ -380,7 +382,7 @@ class FunSpecTest { | throwOrDoSomethingElse() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -393,7 +395,7 @@ class FunSpecTest { """ |public fun foo() = 1 | - """.trimMargin() + """.trimMargin(), ) } @@ -407,7 +409,7 @@ class FunSpecTest { """ |public fun foo(): kotlin.Nothing = throw java.lang.AssertionError() | - """.trimMargin() + """.trimMargin(), ) } @@ -427,7 +429,7 @@ class FunSpecTest { | */ |public fun foo(nodoc: kotlin.Boolean): kotlin.String = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -443,7 +445,7 @@ class FunSpecTest { |public fun foo(f: () -> kotlin.Unit): kotlin.String { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -461,7 +463,7 @@ class FunSpecTest { |public fun foo(f: () -> kotlin.Unit): kotlin.String { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -478,7 +480,7 @@ class FunSpecTest { |public fun foo(f: kotlin.Int.() -> kotlin.Unit): kotlin.String { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -494,7 +496,7 @@ class FunSpecTest { |public fun foo(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -512,7 +514,7 @@ class FunSpecTest { |public fun foo(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -529,7 +531,7 @@ class FunSpecTest { |public fun <T> foo(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -546,7 +548,7 @@ class FunSpecTest { |public fun foo(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -562,7 +564,7 @@ class FunSpecTest { |public fun foo(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -594,10 +596,10 @@ class FunSpecTest { "f", LambdaTypeName.get( parameters = arrayOf(booleanType), - returnType = unitType - ) + returnType = unitType, + ), ) - .build() + .build(), ) .returns(String::class) .build() @@ -607,7 +609,7 @@ class FunSpecTest { |public fun foo(f: (kotlin.Boolean) -> kotlin.Unit): kotlin.String { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -626,7 +628,7 @@ class FunSpecTest { |public fun foo(f: (kotlin.Boolean, kotlin.String) -> kotlin.Unit): kotlin.String { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -647,7 +649,7 @@ class FunSpecTest { |public fun foo(f: ((kotlin.Boolean, kotlin.String) -> kotlin.Unit)?): kotlin.String { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -668,7 +670,7 @@ class FunSpecTest { |public fun foo(f: ((kotlin.Boolean, kotlin.String?) -> kotlin.Unit)?): kotlin.String { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -682,7 +684,7 @@ class FunSpecTest { """ |public constructor(list: kotlin.collections.List<kotlin.Int>) : this(list[0], list[1]) | - """.trimMargin() + """.trimMargin(), ) } @@ -696,7 +698,7 @@ class FunSpecTest { """ |public constructor(list: kotlin.collections.List<kotlin.Int>) : super(list[0], list[1]) | - """.trimMargin() + """.trimMargin(), ) } @@ -710,7 +712,7 @@ class FunSpecTest { """ |public constructor(a: kotlin.Int) : this() | - """.trimMargin() + """.trimMargin(), ) } @@ -727,7 +729,7 @@ class FunSpecTest { | println() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -747,7 +749,7 @@ class FunSpecTest { """ |public constructor(a: kotlin.Int) | - """.trimMargin() + """.trimMargin(), ) } @@ -785,7 +787,7 @@ class FunSpecTest { |public fun `if`(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -798,7 +800,7 @@ class FunSpecTest { |public fun `with-hyphen`(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -807,7 +809,7 @@ class FunSpecTest { .addKdoc("Fix me") .addAnnotation( AnnotationSpec.builder(SuppressWarnings::class) - .build() + .build(), ) .addModifiers(KModifier.PROTECTED) .addTypeVariable(TypeVariableName("T")) @@ -815,11 +817,11 @@ class FunSpecTest { .returns(String::class) .addParameter( ParameterSpec.builder("config", String::class) - .build() + .build(), ) .addParameter( ParameterSpec.builder("override", TypeVariableName("T")) - .build() + .build(), ) .beginControlFlow("return when") .addStatement(" override is String -> config + override") @@ -844,7 +846,7 @@ class FunSpecTest { | */ |public fun kotlin.String.toBar(): kotlin.String = "bar" | - """.trimMargin() + """.trimMargin(), ) } @@ -865,7 +867,7 @@ class FunSpecTest { | */ |public fun kotlin.String.toBar(): kotlin.String = "bar" | - """.trimMargin() + """.trimMargin(), ) } @@ -876,7 +878,7 @@ class FunSpecTest { .addParameter( ParameterSpec.builder("position", Int::class) .addKdoc("the index of the character that is returned.") - .build() + .build(), ) .addKdoc("Returns the character at the given [position].\n\n") .addStatement("return -1") @@ -893,7 +895,7 @@ class FunSpecTest { | */ |public fun kotlin.String.charAt(position: kotlin.Int): kotlin.Char = -1 | - """.trimMargin() + """.trimMargin(), ) } @@ -919,7 +921,7 @@ class FunSpecTest { """ |public constructor(values: kotlin.collections.List<kotlin.String>) : super(values.toImmutableList()) | - """.trimMargin() + """.trimMargin(), ) } @@ -938,7 +940,7 @@ class FunSpecTest { .addAnnotation( AnnotationSpec.builder(JvmName::class.asClassName()) .addMember("name = %S", "jvmWord") - .build() + .build(), ) val javaWord = AnnotationSpec.builder(JvmName::class.asClassName()) @@ -982,7 +984,7 @@ class FunSpecTest { |internal fun staticMethod(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -995,7 +997,7 @@ class FunSpecTest { |internal final fun finalMethod(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1009,7 +1011,7 @@ class FunSpecTest { |internal fun synchronizedMethod(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1024,7 +1026,7 @@ class FunSpecTest { | codeWithNoNewline() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1040,7 +1042,7 @@ class FunSpecTest { | codeWithNoNewline() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1054,7 +1056,7 @@ class FunSpecTest { """ |public fun function() = codeWithNoNewline() | - """.trimMargin() + """.trimMargin(), ) } @@ -1067,7 +1069,7 @@ class FunSpecTest { """ |public fun function() = codeWithNoNewline() | - """.trimMargin() + """.trimMargin(), ) } @@ -1084,7 +1086,7 @@ class FunSpecTest { |public fun function(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1102,7 +1104,7 @@ class FunSpecTest { |public fun function(): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1113,7 +1115,7 @@ class FunSpecTest { .addFunction( FunSpec.builder("foo") .receiver(type) - .build() + .build(), ) .build() assertThat(spec.toString()).isEqualTo( @@ -1125,7 +1127,7 @@ class FunSpecTest { |public fun (@Annotation () -> Unit).foo(): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1136,7 +1138,7 @@ class FunSpecTest { .addFunction( FunSpec.builder("foo") .returns(type) - .build() + .build(), ) .build() assertThat(spec.toString()).isEqualTo( @@ -1148,7 +1150,7 @@ 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 ba357c4c..7887117b 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/KotlinPoetTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/KotlinPoetTest.kt @@ -32,14 +32,14 @@ class KotlinPoetTest { .addProperty( PropertySpec.builder("c", String::class, KModifier.PUBLIC) .initializer("%S", "C") - .build() + .build(), ) .addFunction(FunSpec.builder("d").build()) .addType(TypeSpec.classBuilder("E").build()) .addProperty( PropertySpec.builder("f", String::class, KModifier.PUBLIC) .initializer("%S", "F") - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -63,7 +63,7 @@ class KotlinPoetTest { | |public val f: String = "F" | - """.trimMargin() + """.trimMargin(), ) } @@ -84,9 +84,9 @@ class KotlinPoetTest { .beginControlFlow("require(cheese.isNotEmpty())") .addStatement("%S", "cheese cannot be empty") .endControlFlow() - .build() + .build(), ) - .build() + .build(), ) assertThat(source.toString()).isEqualTo( """ @@ -104,7 +104,7 @@ class KotlinPoetTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -120,30 +120,30 @@ class KotlinPoetTest { .beginControlFlow("require(!cheese.isEmpty())") .addStatement("%S", "cheese cannot be empty") .endControlFlow() - .build() + .build(), ) .addProperty( PropertySpec.builder("cheese", String::class) .initializer("cheese") - .build() + .build(), ) .addProperty( PropertySpec.builder("cilantro", String::class.asTypeName()) .mutable() .initializer("cilantro") - .build() + .build(), ) .addProperty( PropertySpec.builder("lettuce", String::class) .initializer("lettuce.trim()") - .build() + .build(), ) .addProperty( PropertySpec.builder("onion", Boolean::class) .initializer("true") - .build() + .build(), ) - .build() + .build(), ) assertThat(source.toString()).isEqualTo( """ @@ -167,7 +167,7 @@ class KotlinPoetTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -178,15 +178,15 @@ class KotlinPoetTest { .addProperty( PropertySpec.builder("CHEESE", String::class, KModifier.PRIVATE, KModifier.CONST) .initializer("%S", "monterey jack") - .build() + .build(), ) .addProperty( PropertySpec.builder("sauce", String::class.asTypeName(), KModifier.PUBLIC) .mutable() .initializer("%S", "chipotle mayo") - .build() + .build(), ) - .build() + .build(), ) assertThat(source.toString()).isEqualTo( """ @@ -200,7 +200,7 @@ class KotlinPoetTest { | public var sauce: String = "chipotle mayo" |} | - """.trimMargin() + """.trimMargin(), ) } @@ -218,7 +218,7 @@ class KotlinPoetTest { .addFunction(FunSpec.builder("b").addModifiers(KModifier.PROTECTED).build()) .addFunction(FunSpec.builder("c").addModifiers(KModifier.INTERNAL).build()) .addFunction(FunSpec.builder("d").addModifiers(KModifier.PRIVATE).build()) - .build() + .build(), ) assertThat(source.toString()).isEqualTo( """ @@ -240,7 +240,7 @@ class KotlinPoetTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -252,9 +252,9 @@ class KotlinPoetTest { FunSpec.builder("strings") .addStatement("val a = %S", "basic string") .addStatement("val b = %S", "string with a \$ dollar sign") - .build() + .build(), ) - .build() + .build(), ) assertThat(source.toString()).isEqualTo( "" + @@ -267,7 +267,7 @@ class KotlinPoetTest { " val a = \"basic string\"\n" + " val b = \"string with a \${\'\$\'} dollar sign\"\n" + " }\n" + - "}\n" + "}\n", ) } @@ -286,7 +286,7 @@ class KotlinPoetTest { |whoa |"raw" |string - """.trimMargin() + """.trimMargin(), ) .addStatement( "val d = %S", @@ -295,11 +295,11 @@ class KotlinPoetTest { |string |with |${'$'}a interpolated value - """.trimMargin() + """.trimMargin(), ) - .build() + .build(), ) - .build() + .build(), ) assertThat(source.toString()).isEqualTo( "" + @@ -327,7 +327,7 @@ class KotlinPoetTest { " |\${\'\$\'}a interpolated value\n" + " \"\"\".trimMargin()\n" + " }\n" + - "}\n" + "}\n", ) } @@ -343,9 +343,9 @@ class KotlinPoetTest { FunSpec.builder("strings") .addStatement("val a = %S", "\n") .addStatement("val b = %S", " \n ") - .build() + .build(), ) - .build() + .build(), ) assertThat(source.toString()).isEqualTo( "" + @@ -363,7 +363,7 @@ class KotlinPoetTest { " | \n" + " \"\"\".trimMargin()\n" + " }\n" + - "}\n" + "}\n", ) } @@ -376,11 +376,11 @@ class KotlinPoetTest { .addParameter( ParameterSpec.builder("kind", String::class) .defaultValue("%S", "monterey jack") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) assertThat(source.toString()).isEqualTo( """ @@ -394,7 +394,7 @@ class KotlinPoetTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -405,7 +405,7 @@ class KotlinPoetTest { .returns(String::class) .receiver(String::class) .addStatement("return substring(0, length - 1)") - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -416,7 +416,7 @@ class KotlinPoetTest { | |public fun String.shrink(): String = substring(0, length - 1) | - """.trimMargin() + """.trimMargin(), ) } @@ -428,11 +428,11 @@ class KotlinPoetTest { .receiver( LambdaTypeName.get( parameters = arrayOf(String::class.asClassName()), - returnType = String::class.asTypeName() - ) + returnType = String::class.asTypeName(), + ), ) .addStatement("return substring(0, length - 1)") - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -443,7 +443,7 @@ class KotlinPoetTest { | |public fun ((String) -> String).shrink(): String = substring(0, length - 1) | - """.trimMargin() + """.trimMargin(), ) } @@ -455,11 +455,11 @@ class KotlinPoetTest { .receiver( LambdaTypeName.get( parameters = arrayOf(ParameterSpec.builder("name", String::class).build()), - returnType = Unit::class.asClassName() - ) + returnType = Unit::class.asClassName(), + ), ) .addStatement("return Unit") - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -471,7 +471,7 @@ class KotlinPoetTest { | |public fun ((name: String) -> Unit).whatever(): Unit = Unit | - """.trimMargin() + """.trimMargin(), ) } @@ -485,13 +485,13 @@ class KotlinPoetTest { parameters = listOf( ParameterSpec.builder("name", String::class).build(), ParameterSpec.unnamed(Int::class), - ParameterSpec.builder("age", Long::class).build() + ParameterSpec.builder("age", Long::class).build(), ), - returnType = Unit::class.asClassName() - ) + returnType = Unit::class.asClassName(), + ), ) .addStatement("return Unit") - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -509,7 +509,7 @@ class KotlinPoetTest { | age: Long, |) -> Unit).whatever(): Unit = Unit | - """.trimMargin() + """.trimMargin(), ) } @@ -521,9 +521,9 @@ class KotlinPoetTest { .getter( FunSpec.getterBuilder() .addStatement("return length") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -536,7 +536,7 @@ class KotlinPoetTest { |public val String.extensionProperty: Int | get() = length | - """.trimMargin() + """.trimMargin(), ) } @@ -547,15 +547,15 @@ class KotlinPoetTest { .receiver( LambdaTypeName.get( parameters = arrayOf(String::class.asClassName()), - returnType = String::class.asClassName() - ) + returnType = String::class.asClassName(), + ), ) .getter( FunSpec.getterBuilder() .addStatement("return length") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -568,7 +568,7 @@ class KotlinPoetTest { |public val ((String) -> String).extensionProperty: Int | get() = length | - """.trimMargin() + """.trimMargin(), ) } @@ -589,16 +589,16 @@ class KotlinPoetTest { FunSpec.getterBuilder() .addStatement("println(%S)", "getter") .addStatement("return field") - .build() + .build(), ) .setter( FunSpec.setterBuilder() .addParameter("value", Int::class) .addStatement("println(%S)", "setter") .addStatement("field = value") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -617,7 +617,7 @@ class KotlinPoetTest { | field = value | } | - """.trimMargin() + """.trimMargin(), ) } @@ -628,7 +628,7 @@ class KotlinPoetTest { .builder("foo", ClassName(tacosPackage, "Foo").copy(nullable = true)) .addModifiers(KModifier.PRIVATE) .initializer("DefaultFooRegistry.getInstance().getDefaultFooInstanceForPropertiesFiles(file)") - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -638,7 +638,7 @@ class KotlinPoetTest { |private val foo: Foo? = | DefaultFooRegistry.getInstance().getDefaultFooInstanceForPropertiesFiles(file) | - """.trimMargin() + """.trimMargin(), ) } @@ -651,15 +651,15 @@ class KotlinPoetTest { PropertySpec.builder("q", String::class.asTypeName()) .mutable() .addModifiers(KModifier.ABSTRACT, KModifier.PROTECTED) - .build() + .build(), ) - .build() + .build(), ) .addProperty( PropertySpec.builder("p", String::class) .addModifiers(KModifier.CONST, KModifier.INTERNAL) .initializer("%S", "a") - .build() + .build(), ) .addType( TypeSpec.classBuilder("B") @@ -669,11 +669,14 @@ class KotlinPoetTest { PropertySpec.builder("q", String::class.asTypeName()) .mutable() .addModifiers( - KModifier.FINAL, KModifier.LATEINIT, KModifier.OVERRIDE, KModifier.PUBLIC + KModifier.FINAL, + KModifier.LATEINIT, + KModifier.OVERRIDE, + KModifier.PUBLIC, ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -692,7 +695,7 @@ class KotlinPoetTest { | public final override lateinit var q: String |} | - """.trimMargin() + """.trimMargin(), ) } @@ -704,21 +707,24 @@ class KotlinPoetTest { .addFunction( FunSpec.builder("get") .addModifiers( - KModifier.EXTERNAL, KModifier.INFIX, KModifier.OPEN, KModifier.OPERATOR, - KModifier.PROTECTED + KModifier.EXTERNAL, + KModifier.INFIX, + KModifier.OPEN, + KModifier.OPERATOR, + KModifier.PROTECTED, ) .addParameter("v", String::class) .returns(String::class) - .build() + .build(), ) .addFunction( FunSpec.builder("loop") .addModifiers(KModifier.FINAL, KModifier.INLINE, KModifier.INTERNAL, KModifier.TAILREC) .returns(String::class) .addStatement("return %S", "a") - .build() + .build(), ) - .build() + .build(), ) assertThat(source.toString()).isEqualTo( """ @@ -732,7 +738,7 @@ class KotlinPoetTest { | internal final tailrec inline fun loop(): String = "a" |} | - """.trimMargin() + """.trimMargin(), ) } @@ -743,7 +749,7 @@ class KotlinPoetTest { .addParameter("s", String::class) .returns(String::class) .addStatement("return s + %S", "a") - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -754,7 +760,7 @@ class KotlinPoetTest { | |public fun addA(s: String): String = s + "a" | - """.trimMargin() + """.trimMargin(), ) } @@ -768,18 +774,18 @@ class KotlinPoetTest { PropertySpec.builder("bar", suspendingLambda) .mutable() .initializer("{ %T() }", barType) - .build() + .build(), ) .addProperty( PropertySpec.builder("nullBar", suspendingLambda.copy(nullable = true)) .mutable() .initializer("null") - .build() + .build(), ) .addFunction( FunSpec.builder("foo") .addParameter("bar", suspendingLambda) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -795,7 +801,7 @@ class KotlinPoetTest { |public fun foo(bar: suspend (Foo) -> Bar): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -807,10 +813,10 @@ class KotlinPoetTest { .addParameter( ParameterSpec.builder("timeUnit", TimeUnit::class) .defaultValue("%T.%L", TimeUnit::class, TimeUnit.MILLISECONDS.name) - .build() + .build(), ) .addStatement("this.timeout = timeUnit.toMillis(duration)") - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -825,7 +831,7 @@ class KotlinPoetTest { | this.timeout = timeUnit.toMillis(duration) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -838,20 +844,20 @@ class KotlinPoetTest { "%L", PropertySpec.builder("d1", DYNAMIC) .initializer("%S", "Taco") - .build() - ) + .build(), + ), ) .addCode( CodeBlock.of( "%L", PropertySpec.builder("d2", DYNAMIC) .initializer("1f") - .build() - ) + .build(), + ), ) .addStatement("// dynamics are dangerous!") .addStatement("println(d1 - d2)") - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -867,7 +873,7 @@ class KotlinPoetTest { | println(d1 - d2) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -878,15 +884,15 @@ class KotlinPoetTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("foo", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("foo", String::class) .jvmField() .initializer("foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -901,7 +907,7 @@ class KotlinPoetTest { | public val foo: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -913,9 +919,9 @@ class KotlinPoetTest { .addParameter( "a", List::class.asTypeName() - .parameterizedBy(Int::class.asTypeName().jvmSuppressWildcards()) + .parameterizedBy(Int::class.asTypeName().jvmSuppressWildcards()), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -930,7 +936,7 @@ class KotlinPoetTest { |public fun foo(a: List<@JvmSuppressWildcards Int>): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -954,12 +960,12 @@ class KotlinPoetTest { .addParameter( ParameterSpec.builder("foo", lambdaTypeName) .defaultValue(initializer) - .build() + .build(), ) - .build() + .build(), ) .addProperty(property) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -975,7 +981,7 @@ class KotlinPoetTest { | , |) | - """.trimMargin() + """.trimMargin(), ) } @@ -987,14 +993,14 @@ class KotlinPoetTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("when", Float::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("when", Float::class) .initializer("when") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1007,7 +1013,7 @@ class KotlinPoetTest { | public val `when`: Float, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -1017,7 +1023,7 @@ class KotlinPoetTest { .addFunction( FunSpec.builder("functionWithAPrettyLongNameThatWouldCauseWrapping") .addParameter("parameterWithALongNameThatWouldAlsoCauseWrapping", String::class) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1032,7 +1038,7 @@ class KotlinPoetTest { | Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1049,20 +1055,20 @@ class KotlinPoetTest { AnnotationSpec.builder(wireField) .addMember("tag = %L", 1) .addMember("adapter = %S", "CustomStringAdapterWithALongNameThatCauses") - .build() + .build(), ) .initializer("name") - .build() + .build(), ) .primaryConstructor( FunSpec.constructorBuilder() .addParameter( ParameterSpec.builder("name", String::class) - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1080,7 +1086,7 @@ class KotlinPoetTest { | public val name: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -1091,21 +1097,21 @@ class KotlinPoetTest { TypeSpec.classBuilder("Builder") .addKdoc( "Builder class for Foo. Allows creating instances of Foo by initializing " + - "a subset of their fields, following the Builder pattern.\n" + "a subset of their fields, following the Builder pattern.\n", ) .addFunction( FunSpec.builder("summary_text") .addKdoc( "The description for the choice, e.g. \"Currently unavailable due to " + - "high demand. Please try later.\" May be null." + "high demand. Please try later.\" May be null.", ) .addParameter("summary_text", String::class.asClassName().copy(nullable = true)) .returns(ClassName("com.squareup.tacos", "Builder")) .addStatement("this.summary_text = summary_text") .addStatement("return this") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1129,7 +1135,7 @@ class KotlinPoetTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1140,7 +1146,7 @@ class KotlinPoetTest { .addFunction( FunSpec.builder("main") .addStatement("println(%P)", CodeBlock.of("Here's a taco: \${%T()}", taco)) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1154,7 +1160,7 @@ class KotlinPoetTest { | println(${'"'}""Here's a taco: ${'$'}{Taco()}""${'"'}) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1166,7 +1172,7 @@ class KotlinPoetTest { FunSpec.builder("main") .addStatement("val ints = arrayOf(1, 2, 3)") .addStatement("println(%P)", CodeBlock.of("\${ints.%M()}", contentToString)) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1181,7 +1187,7 @@ class KotlinPoetTest { | println(${'"'}""${'$'}{ints.contentToString()}""${'"'}) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1214,7 +1220,7 @@ class KotlinPoetTest { |public fun test(a: kotlin.Int, b: kotlin.Int): kotlin.Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1231,7 +1237,7 @@ class KotlinPoetTest { FunSpec .builder("test") .addParameter("e", customExceptionName) - .build() + .build(), ) .build() @@ -1249,7 +1255,7 @@ class KotlinPoetTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1261,19 +1267,19 @@ class KotlinPoetTest { FunSpec.constructorBuilder() .addParameter("_", Float::class) .addParameter("____", Float::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("_", Float::class) .initializer("_") - .build() + .build(), ) .addProperty( PropertySpec.builder("____", Float::class) .initializer("____") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1287,7 +1293,7 @@ class KotlinPoetTest { | public val `____`: Float, |) | - """.trimMargin() + """.trimMargin(), ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LambdaTypeNameTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LambdaTypeNameTest.kt index dd44d719..db543a46 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LambdaTypeNameTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LambdaTypeNameTest.kt @@ -33,7 +33,7 @@ class LambdaTypeNameTest { val typeName = LambdaTypeName.get( receiver = Int::class.asClassName(), parameters = listOf(), - returnType = Unit::class.asTypeName() + returnType = Unit::class.asTypeName(), ) assertThat(typeName.toString()).isEqualTo("kotlin.Int.() -> kotlin.Unit") } @@ -42,13 +42,13 @@ class LambdaTypeNameTest { val annotation = IsAnnotated::class.java.getAnnotation(HasSomeAnnotation::class.java) val typeName = LambdaTypeName.get( receiver = Int::class.asClassName().copy( - annotations = listOf(AnnotationSpec.get(annotation, includeDefaultValues = true)) + annotations = listOf(AnnotationSpec.get(annotation, includeDefaultValues = true)), ), parameters = listOf(), - returnType = Unit::class.asTypeName() + returnType = Unit::class.asTypeName(), ) assertThat(typeName.toString()).isEqualTo( - "(@com.squareup.kotlinpoet.LambdaTypeNameTest.HasSomeAnnotation kotlin.Int).() -> kotlin.Unit" + "(@com.squareup.kotlinpoet.LambdaTypeNameTest.HasSomeAnnotation kotlin.Int).() -> kotlin.Unit", ) } @@ -57,10 +57,10 @@ class LambdaTypeNameTest { receiver = Int::class.asTypeName(), parameters = listOf(), returnType = Unit::class.asTypeName(), - contextReceivers = listOf(STRING) + contextReceivers = listOf(STRING), ) assertThat(typeName.toString()).isEqualTo( - "context(kotlin.String) kotlin.Int.() -> kotlin.Unit" + "context(kotlin.String) kotlin.Int.() -> kotlin.Unit", ) } @@ -69,10 +69,10 @@ class LambdaTypeNameTest { Int::class.asTypeName(), listOf(), Unit::class.asTypeName(), - listOf(STRING, BOOLEAN) + listOf(STRING, BOOLEAN), ) assertThat(typeName.toString()).isEqualTo( - "context(kotlin.String, kotlin.Boolean) kotlin.Int.() -> kotlin.Unit" + "context(kotlin.String, kotlin.Boolean) kotlin.Int.() -> kotlin.Unit", ) } @@ -82,11 +82,11 @@ class LambdaTypeNameTest { Int::class.asTypeName(), listOf(), Unit::class.asTypeName(), - listOf(genericType) + listOf(genericType), ) assertThat(typeName.toString()).isEqualTo( - "context(T) kotlin.Int.() -> kotlin.Unit" + "context(T) kotlin.Int.() -> kotlin.Unit", ) } @@ -96,11 +96,11 @@ class LambdaTypeNameTest { Int::class.asTypeName(), listOf(), Unit::class.asTypeName(), - listOf(annotatedType) + listOf(annotatedType), ) assertThat(typeName.toString()).isEqualTo( - "context(@com.squareup.kotlinpoet.FunSpecTest.TestAnnotation kotlin.String) kotlin.Int.() -> kotlin.Unit" + "context(@com.squareup.kotlinpoet.FunSpecTest.TestAnnotation kotlin.String) kotlin.Int.() -> kotlin.Unit", ) } @@ -110,9 +110,9 @@ class LambdaTypeNameTest { parameters = arrayOf( ParameterSpec.builder("foo", Int::class) .addAnnotation(Nullable::class) - .build() + .build(), ), - returnType = Unit::class.asTypeName() + returnType = Unit::class.asTypeName(), ) }.hasMessageThat().isEqualTo("Parameters with annotations are not allowed") } @@ -123,9 +123,9 @@ class LambdaTypeNameTest { parameters = arrayOf( ParameterSpec.builder("foo", Int::class) .addModifiers(VARARG) - .build() + .build(), ), - returnType = Unit::class.asTypeName() + returnType = Unit::class.asTypeName(), ) }.hasMessageThat().isEqualTo("Parameters with modifiers are not allowed") } @@ -136,9 +136,9 @@ class LambdaTypeNameTest { parameters = arrayOf( ParameterSpec.builder("foo", Int::class) .defaultValue("42") - .build() + .build(), ), - returnType = Unit::class.asTypeName() + returnType = Unit::class.asTypeName(), ) }.hasMessageThat().isEqualTo("Parameters with default values are not allowed") } @@ -146,11 +146,11 @@ class LambdaTypeNameTest { @Test fun lambdaReturnType() { val returnTypeName = LambdaTypeName.get( parameters = arrayOf(Int::class.asTypeName()), - returnType = Unit::class.asTypeName() + returnType = Unit::class.asTypeName(), ) val typeName = LambdaTypeName.get( parameters = arrayOf(Int::class.asTypeName()), - returnType = returnTypeName + returnType = returnTypeName, ) assertThat(typeName.toString()) .isEqualTo("(kotlin.Int) -> ((kotlin.Int) -> kotlin.Unit)") @@ -159,11 +159,11 @@ class LambdaTypeNameTest { @Test fun lambdaParameterType() { val parameterTypeName = LambdaTypeName.get( parameters = arrayOf(Int::class.asTypeName()), - returnType = Int::class.asTypeName() + returnType = Int::class.asTypeName(), ) val typeName = LambdaTypeName.get( parameters = arrayOf(parameterTypeName), - returnType = Unit::class.asTypeName() + returnType = Unit::class.asTypeName(), ) assertThat(typeName.toString()) .isEqualTo("((kotlin.Int) -> kotlin.Int) -> kotlin.Unit") diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrapperTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrapperTest.kt index 72ec76bf..8fdbda83 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 3a8cf208..a7f5ec96 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrappingTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/LineWrappingTest.kt @@ -24,7 +24,7 @@ class LineWrappingTest { .addStatement( "return %L * %L * %L * %L * %L * %L * %L * %L * %L * %L * %L * %L", 10000000000, 20000000000, 30000000000, 40000000000, 50000000000, 60000000000, - 70000000000, 80000000000, 90000000000, 10000000000, 20000000000, 30000000000 + 70000000000, 80000000000, 90000000000, 10000000000, 20000000000, 30000000000, ) .build() assertThat(toString(wrapMe)).isEqualTo( @@ -34,7 +34,7 @@ class LineWrappingTest { |public fun wrapMe() = 10000000000 * 20000000000 * 30000000000 * 40000000000 * 50000000000 * | 60000000000 * 70000000000 * 80000000000 * 90000000000 * 10000000000 * 20000000000 * 30000000000 | - """.trimMargin() + """.trimMargin(), ) } @@ -43,7 +43,7 @@ class LineWrappingTest { .addStatement( "return %S+%S+%S+%S+%S+%S+%S+%S+%S+%S+%S+%S", "Aaaa Aaaa", "Bbbb Bbbb", "Cccc Cccc", "Dddd Dddd", "Eeee Eeee", "Ffff Ffff", - "Gggg Gggg", "Hhhh Hhhh", "Iiii Iiii", "Jjjj Jjjj", "Kkkk Kkkk", "Llll Llll" + "Gggg Gggg", "Hhhh Hhhh", "Iiii Iiii", "Jjjj Jjjj", "Kkkk Kkkk", "Llll Llll", ) .build() assertThat(toString(wrapMe)).isEqualTo( @@ -53,7 +53,7 @@ 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(), ) } @@ -62,7 +62,7 @@ class LineWrappingTest { .addStatement( "return %L·*·%L·*·%L·*·%L·*·%L·*·%L·*·%L·*·%L·*·%L·*·%L·*·%L·*·%L", 10000000000, 20000000000, 30000000000, 40000000000, 50000000000, 60000000000, - 70000000000, 80000000000, 90000000000, 10000000000, 20000000000, 30000000000 + 70000000000, 80000000000, 90000000000, 10000000000, 20000000000, 30000000000, ) .build() assertThat(toString(wrapMe)).isEqualTo( @@ -72,7 +72,7 @@ class LineWrappingTest { |public fun wrapMe() = | 10000000000 * 20000000000 * 30000000000 * 40000000000 * 50000000000 * 60000000000 * 70000000000 * 80000000000 * 90000000000 * 10000000000 * 20000000000 * 30000000000 | - """.trimMargin() + """.trimMargin(), ) } @@ -86,7 +86,7 @@ class LineWrappingTest { | |public fun wrapMe() = "a·b" | - """.trimMargin() + """.trimMargin(), ) } @@ -110,7 +110,7 @@ class LineWrappingTest { | val d = 4096 |} | - """.trimMargin() + """.trimMargin(), ) } @@ -136,7 +136,7 @@ class LineWrappingTest { | "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -1 |} | - """.trimMargin() + """.trimMargin(), ) } @@ -200,7 +200,7 @@ class LineWrappingTest { | } |} | - """.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 3dc21988..6e0e2af4 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/MemberNameTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/MemberNameTest.kt @@ -46,7 +46,7 @@ class MemberNameTest { | val bestTaco = bestTacoEver |} | - """.trimMargin() + """.trimMargin(), ) } @@ -57,7 +57,7 @@ class MemberNameTest { .addFunction( FunSpec.builder("makeTastyTacos") .addStatement("%M()", createTaco) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -71,7 +71,7 @@ class MemberNameTest { | createTaco() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -81,7 +81,7 @@ class MemberNameTest { .addFunction( FunSpec.builder("makeTastyTacos") .addStatement("%M()", createTaco) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -94,20 +94,20 @@ class MemberNameTest { | createTaco() |} | - """.trimMargin() + """.trimMargin(), ) } @Test fun memberInsideClassInSamePackage() { val createTaco = MemberName( ClassName("com.squareup.tacos", "Town"), - "createTaco" + "createTaco", ) val file = FileSpec.builder("com.squareup.tacos", "Tacos") .addFunction( FunSpec.builder("makeTastyTacos") .addStatement("%M()", createTaco) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -121,7 +121,7 @@ class MemberNameTest { | createTaco() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -133,7 +133,7 @@ class MemberNameTest { FunSpec.builder("makeTastyTacos") .addStatement("%M()", createSquareTaco) .addStatement("%M()", createTwitterTaco) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -148,7 +148,7 @@ class MemberNameTest { | com.twitter.tacos.createTaco() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -162,7 +162,7 @@ class MemberNameTest { FunSpec.builder("makeTastyTacos") .addStatement("%M()", createSquareTaco) .addStatement("%M()", createTwitterTaco) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -178,7 +178,7 @@ class MemberNameTest { | TwitterTacos.Companion.createTaco() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -190,7 +190,7 @@ class MemberNameTest { FunSpec.builder("makeTastyTacos") .addStatement("val tacos = %T()", squareTacosClass) .addStatement("%M(tacos)", squareTacosFunction) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -205,7 +205,7 @@ class MemberNameTest { | com.squareup.tacos.math.SquareTacos(tacos) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -217,14 +217,14 @@ class MemberNameTest { .addFunction( FunSpec.builder("test") .addStatement("%M(%S)", kotlinErrorMember, "errorText") - .build() + .build(), ) .addFunction( FunSpec .builder("error") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -242,7 +242,7 @@ class MemberNameTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -254,7 +254,7 @@ class MemberNameTest { .addFunction( FunSpec .builder("error") - .build() + .build(), ) .addType( TypeSpec.classBuilder("TacoTest") @@ -262,11 +262,11 @@ class MemberNameTest { .addFunction( FunSpec.builder("test") .addStatement("%M(%S)", kotlinErrorMember, "errorText") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -286,7 +286,7 @@ class MemberNameTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -298,18 +298,18 @@ class MemberNameTest { .addFunction( FunSpec .builder("error") - .build() + .build(), ) .addType( TypeSpec.classBuilder("TacoTest") .addFunction( FunSpec.builder("test") .addStatement("%M(%S)", kotlinErrorMember, "errorText") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -330,7 +330,7 @@ class MemberNameTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -344,7 +344,7 @@ class MemberNameTest { FunSpec.builder("makeTastyTacos") .addStatement("%M()", createSquareTaco) .addStatement("%M()", createTwitterTaco) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -360,7 +360,7 @@ class MemberNameTest { | createTwitterTaco() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -373,9 +373,9 @@ class MemberNameTest { FunSpec.builder("setUp") .addAnnotation(Before::class) .addStatement("%M(tacoService.createTaco()).thenReturn(tastyTaco())", `when`) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -393,7 +393,7 @@ class MemberNameTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -407,7 +407,7 @@ class MemberNameTest { FunSpec.builder("whenTastyTacos") .addStatement("%M()", whenSquareTaco) .addStatement("%M()", whenTwitterTaco) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -423,7 +423,7 @@ class MemberNameTest { | TwitterTacos.Companion.`when`() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -451,7 +451,7 @@ class MemberNameTest { | val bestTacoFactory = TacoTruck::bestTacoEver |} | - """.trimMargin() + """.trimMargin(), ) } @@ -461,7 +461,7 @@ class MemberNameTest { .addFunction( FunSpec.builder("main") .addStatement("println(%M())", produceTacos) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -475,7 +475,7 @@ class MemberNameTest { | println(`produce tacos`()) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -504,7 +504,7 @@ class MemberNameTest { .addParameter("tacos", LIST.parameterizedBy(taco)) .addParameter("packager", packager) .addStatement("packager.%N(tacos)", packager.member("package")) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -520,7 +520,7 @@ class MemberNameTest { | packager.`package`(tacos) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -537,7 +537,7 @@ class MemberNameTest { .addStatement("if (ingredient is %T) taco %M ingredient", meat, minusAssign) .endControlFlow() .addStatement("return taco") - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -557,7 +557,7 @@ class MemberNameTest { | return taco |} | - """.trimMargin() + """.trimMargin(), ) } @@ -579,11 +579,11 @@ class MemberNameTest { addStatement("super.hashCode = result") endControlFlow() addStatement("return result") - } + }, ) - .build() + .build(), ) - .build() + .build(), ) .build() //language=kotlin @@ -605,7 +605,7 @@ class MemberNameTest { } } - """.trimIndent() + """.trimIndent(), ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterSpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterSpecTest.kt index 7a51f8e3..d764f441 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterSpecTest.kt @@ -77,7 +77,7 @@ class ParameterSpecTest { .addAnnotation( AnnotationSpec.builder(JvmName::class.asClassName()) .addMember("name = %S", "jvmWord") - .build() + .build(), ) val javaWord = AnnotationSpec.builder(JvmName::class.asClassName()) @@ -107,7 +107,7 @@ class ParameterSpecTest { | println("arg=${'$'}arg") |} | - """.trimMargin() + """.trimMargin(), ) } @@ -118,7 +118,7 @@ class ParameterSpecTest { .addFunction( FunSpec.builder("foo") .addParameter("bar", type) - .build() + .build(), ) .build() assertThat(spec.toString()).isEqualTo( @@ -130,7 +130,7 @@ class ParameterSpecTest { |public fun foo(bar: @Annotation () -> Unit): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterizedTypeNameTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterizedTypeNameTest.kt index 0b335b73..f4e5625b 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterizedTypeNameTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ParameterizedTypeNameTest.kt @@ -119,8 +119,8 @@ class ParameterizedTypeNameTest { "Entry", listOf( java.lang.String::class.java.asClassName(), - java.lang.Integer::class.java.asClassName() - ) + java.lang.Integer::class.java.asClassName(), + ), ) .copy(typeArguments = listOf(STAR, STAR)) assertThat(typeName.toString()).isEqualTo("java.util.Map<java.lang.String, java.lang.Integer>.Entry<*, *>") diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/PropertySpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/PropertySpecTest.kt index c7a04390..fd61d896 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/PropertySpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/PropertySpecTest.kt @@ -49,7 +49,7 @@ class PropertySpecTest { .setter( FunSpec.setterBuilder() .addModifiers(PRIVATE) - .build() + .build(), ) .build() @@ -58,7 +58,7 @@ class PropertySpecTest { |var foo: kotlin.String | private set | - """.trimMargin() + """.trimMargin(), ) } @@ -70,7 +70,7 @@ class PropertySpecTest { .setter( FunSpec.setterBuilder() .addStatement("body()") - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo("parameterless setter cannot have code") @@ -82,12 +82,12 @@ class PropertySpecTest { .getter( FunSpec.getterBuilder() .addModifiers(EXTERNAL) - .build() + .build(), ) .setter( FunSpec.setterBuilder() .addModifiers(EXTERNAL) - .build() + .build(), ) .build() @@ -97,7 +97,7 @@ class PropertySpecTest { | external get | external set | - """.trimMargin() + """.trimMargin(), ) } @@ -108,7 +108,7 @@ class PropertySpecTest { FunSpec.getterBuilder() .addModifiers(EXTERNAL) .addStatement("return %S", "foo") - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo("external getter cannot have code") @@ -120,7 +120,7 @@ class PropertySpecTest { FunSpec.getterBuilder() .addModifiers(KModifier.INLINE) .addStatement("return %S", "foo") - .build() + .build(), ) .build() @@ -129,7 +129,7 @@ class PropertySpecTest { |inline val foo: kotlin.String | get() = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -140,7 +140,7 @@ class PropertySpecTest { FunSpec.getterBuilder() .addModifiers(KModifier.INLINE) .addStatement("return %S", "foo") - .build() + .build(), ) .build() @@ -149,7 +149,7 @@ class PropertySpecTest { |var foo: kotlin.String | inline get() = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -160,13 +160,13 @@ class PropertySpecTest { FunSpec.getterBuilder() .addModifiers(KModifier.INLINE) .addStatement("return %S", "foo") - .build() + .build(), ) .setter( FunSpec.setterBuilder() .addModifiers(KModifier.INLINE) .addParameter("value", String::class) - .build() + .build(), ) .build() @@ -177,7 +177,7 @@ class PropertySpecTest { | set(`value`) { | } | - """.trimMargin() + """.trimMargin(), ) } @@ -188,7 +188,7 @@ class PropertySpecTest { .build() }.hasMessageThat().isEqualTo( "KotlinPoet doesn't allow setting the inline modifier on " + - "properties. You should mark either the getter, the setter, or both inline." + "properties. You should mark either the getter, the setter, or both inline.", ) } @@ -211,7 +211,7 @@ class PropertySpecTest { """ |val `object`: kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -223,7 +223,7 @@ class PropertySpecTest { """ |var `object`: kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -236,7 +236,7 @@ class PropertySpecTest { """ |external val foo: kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -248,7 +248,7 @@ class PropertySpecTest { """ |val `with-hyphen`: kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -266,13 +266,13 @@ class PropertySpecTest { FunSpec.getterBuilder() .addModifiers(KModifier.INLINE) .addStatement("return %S", 42) - .build() + .build(), ) .setter( FunSpec.setterBuilder() .addModifiers(KModifier.INLINE) .addParameter("value", Int::class) - .build() + .build(), ) .addOriginatingElement(originatingElement) .build() @@ -299,7 +299,7 @@ class PropertySpecTest { .addAnnotation( AnnotationSpec.builder(JvmName::class.asClassName()) .addMember("name = %S", "jvmWord") - .build() + .build(), ) val javaWord = AnnotationSpec.builder(JvmName::class.asClassName()) @@ -321,7 +321,7 @@ class PropertySpecTest { FunSpec.getterBuilder() .addModifiers(KModifier.INLINE) .addStatement("return stuff as %T", t) - .build() + .build(), ) .build() assertThat(prop.toString()).isEqualTo( @@ -329,7 +329,7 @@ class PropertySpecTest { |private inline val <T : kotlin.Any> kotlin.reflect.KClass<T>.someFunction: T | get() = stuff as T | - """.trimMargin() + """.trimMargin(), ) } @@ -343,7 +343,7 @@ class PropertySpecTest { .getter( FunSpec.getterBuilder() .addStatement("return %S", "") - .build() + .build(), ) .build() assertThat(prop.toString()).isEqualTo( @@ -351,7 +351,7 @@ class PropertySpecTest { |private val <T, R : kotlin.Any> java.util.function.Function<T, R>.`property`: kotlin.String where T : java.io.Serializable, T : kotlin.Cloneable | get() = "" | - """.trimMargin() + """.trimMargin(), ) } @@ -364,7 +364,7 @@ class PropertySpecTest { FunSpec.getterBuilder() .addModifiers(KModifier.INLINE) .addStatement("return stuff as %T", t) - .build() + .build(), ) .build() assertThat(prop.toString()).isEqualTo( @@ -372,7 +372,7 @@ class PropertySpecTest { |private inline val <reified T> kotlin.reflect.KClass<T>.someFunction: T | get() = stuff as T | - """.trimMargin() + """.trimMargin(), ) } @@ -382,7 +382,7 @@ class PropertySpecTest { .addTypeVariable(TypeVariableName("T").copy(reified = true)) .build() }.hasMessageThat().isEqualTo( - "only type parameters of properties with inline getters and/or setters can be reified!" + "only type parameters of properties with inline getters and/or setters can be reified!", ) } @@ -393,11 +393,11 @@ class PropertySpecTest { .getter( FunSpec.getterBuilder() .addStatement("return %S", "") - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo( - "only type parameters of properties with inline getters and/or setters can be reified!" + "only type parameters of properties with inline getters and/or setters can be reified!", ) } @@ -410,11 +410,11 @@ class PropertySpecTest { FunSpec.setterBuilder() .addParameter("value", String::class) .addStatement("println()") - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo( - "only type parameters of properties with inline getters and/or setters can be reified!" + "only type parameters of properties with inline getters and/or setters can be reified!", ) } @@ -426,18 +426,18 @@ class PropertySpecTest { .getter( FunSpec.getterBuilder() .addStatement("return %S", "") - .build() + .build(), ) .setter( FunSpec.setterBuilder() .addModifiers(KModifier.INLINE) .addParameter("value", String::class) .addStatement("println()") - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo( - "only type parameters of properties with inline getters and/or setters can be reified!" + "only type parameters of properties with inline getters and/or setters can be reified!", ) } @@ -449,7 +449,7 @@ class PropertySpecTest { .addModifiers(KModifier.INLINE) .addParameter("value", String::class) .addStatement("println()") - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo("only a mutable property can have a setter") @@ -474,7 +474,7 @@ class PropertySpecTest { |} | | - """.trimMargin() + """.trimMargin(), ) } @@ -505,7 +505,7 @@ class PropertySpecTest { | */ |val topping: kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -520,7 +520,7 @@ class PropertySpecTest { | */ |val topping: kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -531,7 +531,7 @@ class PropertySpecTest { FunSpec.getterBuilder() .addKdoc("Simple multiplier") .addStatement("return %L * 5", "field") - .build() + .build(), ) .build() @@ -543,7 +543,7 @@ class PropertySpecTest { | */ | get() = field * 5 | - """.trimMargin() + """.trimMargin(), ) } @@ -553,7 +553,7 @@ class PropertySpecTest { .addProperty( PropertySpec.builder("FOO", String::class, KModifier.CONST) .initializer("%S", text) - .build() + .build(), ) .build() assertThat(spec.toString()).isEqualTo( @@ -564,7 +564,7 @@ class PropertySpecTest { | |public const val FOO: String = "This is a long string with a newline\nin the middle." | - """.trimMargin() + """.trimMargin(), ) } @@ -582,7 +582,7 @@ class PropertySpecTest { | |public val foo: @Annotation () -> Unit | - """.trimMargin() + """.trimMargin(), ) } @@ -595,14 +595,14 @@ class PropertySpecTest { .getter( FunSpec.getterBuilder() .addStatement("return %S", "foo") - .build() + .build(), ) .setter( FunSpec.setterBuilder() .addParameter("foo", String::class) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -617,7 +617,7 @@ class PropertySpecTest { set(foo) { } - """.trimIndent() + """.trimIndent(), ) } @@ -632,7 +632,7 @@ class PropertySpecTest { mutablePropertySpecBuilder() .getter( FunSpec.getterBuilder() - .build() + .build(), ) .build() }.hasMessageThat() @@ -642,7 +642,7 @@ class PropertySpecTest { mutablePropertySpecBuilder() .setter( FunSpec.setterBuilder() - .build() + .build(), ) .build() }.hasMessageThat() @@ -666,16 +666,16 @@ class PropertySpecTest { .getter( FunSpec.getterBuilder() .addStatement("return \"\"") - .build() + .build(), ) .setter( FunSpec.setterBuilder() .addParameter( ParameterSpec.builder("value", STRING) - .build() + .build(), ) .addStatement("") - .build() + .build(), ) .build() @@ -688,7 +688,7 @@ class PropertySpecTest { | | } | - """.trimMargin() + """.trimMargin(), ) } @@ -699,7 +699,7 @@ class PropertySpecTest { .getter( FunSpec.getterBuilder() .addStatement("return length") - .build() + .build(), ) .build() @@ -709,12 +709,13 @@ class PropertySpecTest { |val foo: kotlin.Int | get() = length | - """.trimMargin() + """.trimMargin(), ) } @OptIn(DelicateKotlinPoetApi::class) - @Test fun annotatedValWithContextReceiver() { + @Test + fun annotatedValWithContextReceiver() { val propertySpec = PropertySpec.builder("foo", INT) .mutable(false) .addAnnotation(AnnotationSpec.get(TestAnnotation())) @@ -722,7 +723,7 @@ class PropertySpecTest { .getter( FunSpec.getterBuilder() .addStatement("return length") - .build() + .build(), ) .build() @@ -733,7 +734,7 @@ class PropertySpecTest { |val foo: kotlin.Int | get() = length | - """.trimMargin() + """.trimMargin(), ) } } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/StringsTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/StringsTest.kt index 94aa6d80..49bec351 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/StringsTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/StringsTest.kt @@ -37,7 +37,7 @@ class StringsTest { "public fun getString() = \"\"\"\n" + "|Some string\n" + "|\${\'\$\'}annoyingUser is annoying.\n" + - "\"\"\".trimMargin()\n" + "\"\"\".trimMargin()\n", ) } @@ -59,7 +59,7 @@ class StringsTest { "public fun getString() = \"\"\"\n" + "|Some string\n" + "|\$annoyingUser is annoying.\n" + - "\"\"\".trimMargin()\n" + "\"\"\".trimMargin()\n", ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TaggableTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TaggableTest.kt index 8e2b472c..504798b6 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TaggableTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TaggableTest.kt @@ -35,7 +35,7 @@ class TaggableTest(val builder: Taggable.Builder<*>) { ParameterSpec.builder("test", String::class.asClassName()), PropertySpec.builder("test", String::class.asClassName()), TypeAliasSpec.builder("Test", String::class.asClassName()), - TypeSpec.classBuilder("Test") + TypeSpec.classBuilder("Test"), ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TestFiler.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TestFiler.kt index 3e2b5520..bb24d564 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TestFiler.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TestFiler.kt @@ -34,7 +34,7 @@ import javax.tools.SimpleJavaFileObject internal class TestFiler( fileSystem: FileSystem, - private val fileSystemRoot: Path + private val fileSystemRoot: Path, ) : Filer { internal inner class Source(private val path: Path) : @@ -54,7 +54,7 @@ internal class TestFiler( override fun createSourceFile( name: CharSequence, - vararg originatingElements: Element + vararg originatingElements: Element, ): JavaFileObject { val relative = name.toString().replace(".", separator) + ".kt" // Assumes well-formed. val path = fileSystemRoot.resolve(relative) @@ -69,7 +69,7 @@ internal class TestFiler( location: JavaFileManager.Location, pkg: CharSequence, relativeName: CharSequence, - vararg originatingElements: Element + vararg originatingElements: Element, ): FileObject { val relative = pkg.toString().replace(".", separator) + separator + relativeName val path = fileSystemRoot.resolve(relative) @@ -80,7 +80,7 @@ internal class TestFiler( override fun getResource( location: JavaFileManager.Location, pkg: CharSequence, - relativeName: CharSequence + relativeName: CharSequence, ) = throw UnsupportedOperationException("Not implemented.") } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeAliasSpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeAliasSpecTest.kt index f8edc7a9..f5c7eb22 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeAliasSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeAliasSpecTest.kt @@ -33,7 +33,7 @@ class TypeAliasSpecTest { """ |public typealias Word = kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -48,7 +48,7 @@ class TypeAliasSpecTest { """ |public typealias Word<V> = kotlin.collections.List<V> | - """.trimMargin() + """.trimMargin(), ) } @@ -62,7 +62,7 @@ class TypeAliasSpecTest { """ |public typealias Word = kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -76,7 +76,7 @@ class TypeAliasSpecTest { """ |internal typealias Word = kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -90,7 +90,7 @@ class TypeAliasSpecTest { """ |private typealias Word = kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -106,7 +106,7 @@ class TypeAliasSpecTest { """ |public actual typealias AtomicRef<V> = java.util.concurrent.atomic.AtomicReference<V> | - """.trimMargin() + """.trimMargin(), ) } @@ -123,7 +123,7 @@ class TypeAliasSpecTest { | */ |public typealias Word = kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -133,7 +133,7 @@ class TypeAliasSpecTest { .addAnnotation( AnnotationSpec.builder(TypeAliasAnnotation::class.asClassName()) .addMember("value = %S", "words!") - .build() + .build(), ) .build() @@ -142,7 +142,7 @@ class TypeAliasSpecTest { |@com.squareup.kotlinpoet.TypeAliasAnnotation(value = "words!") |public typealias Word = kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -159,7 +159,7 @@ class TypeAliasSpecTest { | */ |public typealias Word = kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -211,7 +211,7 @@ class TypeAliasSpecTest { .addAnnotation( AnnotationSpec.builder(TypeAliasAnnotation::class.asClassName()) .addMember("value = %S", "value1") - .build() + .build(), ) val javaWord = AnnotationSpec.builder(TypeAliasAnnotation::class.asClassName()) @@ -229,7 +229,7 @@ class TypeAliasSpecTest { """ |public typealias `fun` = kotlin.String | - """.trimMargin() + """.trimMargin(), ) } @@ -241,7 +241,7 @@ class TypeAliasSpecTest { """ |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 91a2d359..8a1ed7ea 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeSpecTest.kt @@ -55,7 +55,8 @@ import org.junit.Rule class TypeSpecTest { private val tacosPackage = "com.squareup.tacos" - @Rule @JvmField val compilation = CompilationRule() + @Rule @JvmField + val compilation = CompilationRule() private fun getElement(`class`: Class<*>): TypeElement { return compilation.elements.getTypeElement(`class`.canonicalName) @@ -72,7 +73,7 @@ class TypeSpecTest { .addModifiers(KModifier.PUBLIC, KModifier.FINAL, KModifier.OVERRIDE) .returns(String::class) .addStatement("return %S", "taco") - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -85,7 +86,7 @@ class TypeSpecTest { | public final override fun toString(): String = "taco" |} | - """.trimMargin() + """.trimMargin(), ) assertEquals(1906837485, taco.hashCode().toLong()) // Update expected number if source changes. } @@ -117,7 +118,7 @@ class TypeSpecTest { | public val inString: List<in String> |} | - """.trimMargin() + """.trimMargin(), ) } @@ -142,7 +143,7 @@ class TypeSpecTest { .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE) .addParameter("bar", bar) .addCode("/* code snippets */\n") - .build() + .build(), ) .build() val aThingThang = TypeSpec.anonymousClassBuilder() @@ -153,14 +154,14 @@ class TypeSpecTest { .returns(thungOfSuperBar) .addParameter(thungParameter) .addStatement("return %L", aSimpleThung) - .build() + .build(), ) .build() val taco = TypeSpec.classBuilder("Taco") .addProperty( PropertySpec.builder("NAME", thingThangOfFooBar) .initializer("%L", aThingThang) - .build() + .build(), ) .build() @@ -181,7 +182,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -195,7 +196,7 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("names", superclass) .initializer("%L", anonymousClass) - .build() + .build(), ).build() assertThat(toString(taco)).isEqualTo( @@ -210,7 +211,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -224,13 +225,13 @@ class TypeSpecTest { FunSpec.builder("run") .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE) .addCode("/* code snippets */\n") - .build() + .build(), ).build() val taco = TypeSpec.classBuilder("Taco") .addProperty( PropertySpec.builder("NAME", Runnable::class) .initializer("%L", anonymousClass) - .build() + .build(), ).build() assertThat(toString(taco)).isEqualTo( @@ -249,7 +250,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -259,7 +260,7 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("NAME", Any::class) .initializer("%L", anonymousClass) - .build() + .build(), ).build() assertThat(toString(taco)).isEqualTo( @@ -273,7 +274,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -286,29 +287,29 @@ class TypeSpecTest { .addParameter( ParameterSpec.builder("one", String::class) .addAnnotation(ClassName(tacosPackage, "Ping")) - .build() + .build(), ) .addParameter( ParameterSpec.builder("two", String::class) .addAnnotation(ClassName(tacosPackage, "Ping")) - .build() + .build(), ) .addParameter( ParameterSpec.builder("three", String::class) .addAnnotation( AnnotationSpec.builder(ClassName(tacosPackage, "Pong")) .addMember("%S", "pong") - .build() + .build(), ) - .build() + .build(), ) .addParameter( ParameterSpec.builder("four", String::class) .addAnnotation(ClassName(tacosPackage, "Ping")) - .build() + .build(), ) .addCode("/* code snippets */\n") - .build() + .build(), ) .build() @@ -331,7 +332,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -345,7 +346,7 @@ class TypeSpecTest { .addProperty( "meat", String::class.asClassName() - .copy(annotations = listOf(AnnotationSpec.builder(freeRange).build())) + .copy(annotations = listOf(AnnotationSpec.builder(freeRange).build())), ) .build() @@ -360,7 +361,7 @@ class TypeSpecTest { | public val meat: @FreeRange String |} | - """.trimMargin() + """.trimMargin(), ) } @@ -384,38 +385,38 @@ class TypeSpecTest { AnnotationSpec.builder(headers) .addMember("%S", "Accept: application/json") .addMember("%S", "User-Agent: foobar") - .build() + .build(), ) .addAnnotation( AnnotationSpec.builder(post) .addMember("%S", "/foo/bar") - .build() + .build(), ) .returns(observable.parameterizedBy(fooBar)) .addParameter( ParameterSpec.builder("things", things.parameterizedBy(thing)) .addAnnotation(body) - .build() + .build(), ) .addParameter( ParameterSpec.builder("query", map.parameterizedBy(string, string)) .addAnnotation( AnnotationSpec.builder(queryMap) .addMember("encodeValues = %L", "false") - .build() + .build(), ) - .build() + .build(), ) .addParameter( ParameterSpec.builder("authorization", string) .addAnnotation( AnnotationSpec.builder(header) .addMember("%S", "Authorization") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() @@ -439,7 +440,7 @@ class TypeSpecTest { | ): Observable<FooBar> |} | - """.trimMargin() + """.trimMargin(), ) } @@ -450,9 +451,9 @@ class TypeSpecTest { .addAnnotation( AnnotationSpec.builder(ClassName(tacosPackage, "JsonAdapter")) .addMember("%T::class", ClassName(tacosPackage, "Foo")) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -466,7 +467,7 @@ class TypeSpecTest { | private val thing: String |} | - """.trimMargin() + """.trimMargin(), ) } @@ -478,9 +479,9 @@ class TypeSpecTest { AnnotationSpec.builder(ClassName(tacosPackage, "JsonAdapter")) .addMember("%T::class", ClassName(tacosPackage, "Foo")) .useSiteTarget(AnnotationSpec.UseSiteTarget.FIELD) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -494,7 +495,7 @@ class TypeSpecTest { | private val thing: String |} | - """.trimMargin() + """.trimMargin(), ) } @@ -506,7 +507,7 @@ class TypeSpecTest { .addMember("%T.%N", someType, "PROPERTY") .addMember("%L", 12) .addMember("%S", "goodbye") - .build() + .build(), ) .addModifiers(KModifier.PUBLIC) .build() @@ -521,7 +522,7 @@ class TypeSpecTest { |) |public class Foo | - """.trimMargin() + """.trimMargin(), ) } @@ -532,7 +533,7 @@ class TypeSpecTest { "ROCK", TypeSpec.anonymousClassBuilder() .addKdoc("Avalanche!\n") - .build() + .build(), ) .addEnumConstant( "PAPER", @@ -543,30 +544,30 @@ class TypeSpecTest { .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE, KModifier.OVERRIDE) .returns(String::class) .addCode("return %S\n", "paper airplane!") - .build() + .build(), ) - .build() + .build(), ) .addEnumConstant( "SCISSORS", TypeSpec.anonymousClassBuilder() .addSuperclassConstructorParameter("%S", "peace sign") - .build() + .build(), ) .addProperty( PropertySpec.builder("handPosition", String::class, KModifier.PRIVATE) .initializer("handPosition") - .build() + .build(), ) .primaryConstructor( FunSpec.constructorBuilder() .addParameter("handPosition", String::class) - .build() + .build(), ) .addFunction( FunSpec.constructorBuilder() .addCode("this(%S)\n", "fist") - .build() + .build(), ) .build() assertThat(toString(roshambo)).isEqualTo( @@ -593,7 +594,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -607,14 +608,14 @@ class TypeSpecTest { .addFunction( FunSpec.builder("fold") .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE) - .build() + .build(), ) - .build() + .build(), ) .addFunction( FunSpec.builder("fold") .addModifiers(KModifier.PUBLIC, KModifier.ABSTRACT) - .build() + .build(), ) .build() assertThat(toString(roshambo)).isEqualTo( @@ -633,7 +634,7 @@ class TypeSpecTest { | public abstract fun fold(): Unit |} | - """.trimMargin() + """.trimMargin(), ) } @@ -656,7 +657,7 @@ class TypeSpecTest { | public abstract fun fold(): Unit |} | - """.trimMargin() + """.trimMargin(), ) } @@ -665,7 +666,7 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter(ParameterSpec.builder("name", String::class, VARARG).build()) - .build() + .build(), ) .addProperty(PropertySpec.builder("name", String::class).initializer("name").build()) .build() @@ -679,7 +680,7 @@ class TypeSpecTest { | public vararg val name: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -689,12 +690,12 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter(ParameterSpec.builder("contents", String::class).build()) - .build() + .build(), ) .addProperty( PropertySpec.builder("contents", String::class).initializer("contents") .getter(FunSpec.getterBuilder().addCode("println(%S)\nreturn field", "contents observed!").build()) - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -713,7 +714,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -722,7 +723,7 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter(ParameterSpec.builder("contents", String::class).build()) - .build() + .build(), ) .addProperty( PropertySpec.builder("contents", String::class).initializer("contents") @@ -730,9 +731,9 @@ class TypeSpecTest { .setter( FunSpec.setterBuilder() .addParameter("value", String::class) - .addCode("println(%S)\nfield = value", "contents changed!").build() + .addCode("println(%S)\nfield = value", "contents changed!").build(), ) - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -751,7 +752,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -777,7 +778,7 @@ class TypeSpecTest { | public companion object |} | - """.trimMargin() + """.trimMargin(), ) } @@ -791,9 +792,9 @@ class TypeSpecTest { .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE) .returns(String::class) .addStatement("return %S", "west side") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(toString(roshambo)).isEqualTo( @@ -808,7 +809,7 @@ class TypeSpecTest { | }, |} | - """.trimMargin() + """.trimMargin(), ) } @@ -820,7 +821,7 @@ class TypeSpecTest { "ROCK", TypeSpec.anonymousClassBuilder() .addAnnotation(java.lang.Deprecated::class) - .build() + .build(), ) .addEnumConstant("PAPER") .addEnumConstant("SCISSORS") @@ -838,7 +839,7 @@ class TypeSpecTest { | SCISSORS, |} | - """.trimMargin() + """.trimMargin(), ) } @@ -848,24 +849,24 @@ class TypeSpecTest { .addFunction( FunSpec.builder("throwOne") .throws(IOException::class) - .build() + .build(), ) .addFunction( FunSpec.builder("throwTwo") .throws(IOException::class.asClassName(), ClassName(tacosPackage, "SourCreamException")) - .build() + .build(), ) .addFunction( FunSpec.builder("abstractThrow") .addModifiers(KModifier.ABSTRACT) .throws(IOException::class) - .build() + .build(), ) .addFunction( FunSpec.builder("nativeThrow") .addModifiers(KModifier.EXTERNAL) .throws(IOException::class) - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -895,7 +896,7 @@ class TypeSpecTest { | public external fun nativeThrow(): Unit |} | - """.trimMargin() + """.trimMargin(), ) } @@ -916,7 +917,7 @@ class TypeSpecTest { .returns(Int::class) .addParameter("p", p) .addStatement("return 0") - .build() + .build(), ) .addFunction( FunSpec.builder("of") @@ -928,7 +929,7 @@ class TypeSpecTest { .addParameter("x", p) .addParameter("y", p) .addStatement("throw %T(%S)", UnsupportedOperationException::class, "TODO") - .build() + .build(), ) .build() assertThat(toString(typeSpec)).isEqualTo( @@ -956,7 +957,7 @@ class TypeSpecTest { | ): Location<T, P> = throw UnsupportedOperationException("TODO") |} | - """.trimMargin() + """.trimMargin(), ) } @@ -987,7 +988,7 @@ class TypeSpecTest { | public val y: @A Q |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1010,7 +1011,7 @@ class TypeSpecTest { | |public abstract class Taco : AbstractSet<Food>(), Serializable, Comparable<Taco> | - """.trimMargin() + """.trimMargin(), ) } @@ -1031,7 +1032,7 @@ class TypeSpecTest { | |public class Taco : org.fish.taco.Taco(), Comparable<Taco>, com.taco.bell.Taco | - """.trimMargin() + """.trimMargin(), ) } @@ -1044,7 +1045,7 @@ class TypeSpecTest { .addType( TypeSpec.classBuilder("Inner") .addModifiers(KModifier.INNER) - .build() + .build(), ) .build() @@ -1058,7 +1059,7 @@ class TypeSpecTest { | public inner class Inner |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1081,7 +1082,7 @@ class TypeSpecTest { | SHREDDED_CHEESE, |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1095,13 +1096,13 @@ class TypeSpecTest { "open", TypeSpec.anonymousClassBuilder() .addSuperclassConstructorParameter("%L", 0) - .build() + .build(), ) .addEnumConstant( "closed", TypeSpec.anonymousClassBuilder() .addSuperclassConstructorParameter("%L", 1) - .build() + .build(), ) .build() assertThat(toString(typeSpec)).isEqualTo( @@ -1117,7 +1118,7 @@ class TypeSpecTest { | closed(1), |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1136,7 +1137,7 @@ class TypeSpecTest { | |public interface Taco : Serializable, Comparable<Taco> | - """.trimMargin() + """.trimMargin(), ) } @@ -1146,7 +1147,7 @@ class TypeSpecTest { .addFunction( FunSpec.builder("sam") .addModifiers(ABSTRACT) - .build() + .build(), ) .addFunction(FunSpec.builder("notSam").build()) .build() @@ -1164,7 +1165,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1182,12 +1183,12 @@ class TypeSpecTest { .addFunction( FunSpec.builder("fun1") .addModifiers(ABSTRACT) - .build() + .build(), ) .addFunction( FunSpec.builder("fun2") .addModifiers(ABSTRACT) - .build() + .build(), ) .build() }.hasMessageThat() @@ -1210,15 +1211,15 @@ class TypeSpecTest { TypeSpec.enumBuilder(topping.simpleName) .addEnumConstant("SHREDDED_CHEESE") .addEnumConstant("LEAN_GROUND_BEEF") - .build() + .build(), ) - .build() + .build(), ) .addType( TypeSpec.classBuilder(chips.simpleName) .addProperty("topping", topping) .addProperty("dippingSauce", sauce) - .build() + .build(), ) .addType( TypeSpec.enumBuilder(sauce.simpleName) @@ -1227,7 +1228,7 @@ class TypeSpecTest { .addEnumConstant("QUESO") .addEnumConstant("MILD") .addEnumConstant("FIRE") - .build() + .build(), ) .build() @@ -1268,7 +1269,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1279,14 +1280,14 @@ class TypeSpecTest { FunSpec.constructorBuilder() .addParameter( ParameterSpec.builder("test", Int::class) - .build() + .build(), ) - .build() + .build(), ) .addProperty( PropertySpec.builder("test", Int::class) .initializer("test") - .build() + .build(), ) .build() @@ -1300,7 +1301,7 @@ class TypeSpecTest { | public val test: Int, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -1313,30 +1314,30 @@ class TypeSpecTest { FunSpec.constructorBuilder() .addParameter( ParameterSpec.builder("kind", kindName) - .build() + .build(), ) .addParameter( ParameterSpec.builder("quantity", Int::class) .defaultValue("QUANTITY_DEFAULT") - .build() + .build(), ) - .build() + .build(), ) .addProperty( PropertySpec.builder("kind", kindName) .initializer("kind") - .build() + .build(), ) .addProperty( PropertySpec.builder("quantity", Int::class) .initializer("quantity") - .build() + .build(), ) .addType( TypeSpec.enumBuilder("Kind") .addEnumConstant("SOFT") .addEnumConstant("HARD") - .build() + .build(), ) .addType( TypeSpec.companionObjectBuilder() @@ -1344,9 +1345,9 @@ class TypeSpecTest { PropertySpec .builder("QUANTITY_DEFAULT", Int::class, KModifier.CONST) .initializer("%L", 10_000) - .build() + .build(), ) - .build() + .build(), ) .build() @@ -1370,24 +1371,25 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } - @Ignore @Test fun innerAnnotationInAnnotationDeclaration() { + @Ignore @Test + fun innerAnnotationInAnnotationDeclaration() { val bar = TypeSpec.annotationBuilder("Bar") .primaryConstructor( FunSpec.constructorBuilder() .addParameter( ParameterSpec.builder("value", java.lang.Deprecated::class) - .build() + .build(), ) - .build() + .build(), ) .addProperty( PropertySpec.builder("value", java.lang.Deprecated::class) .initializer("value") - .build() + .build(), ) .build() @@ -1401,7 +1403,7 @@ class TypeSpecTest { | fun value(): Deprecated default @Deprecated |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1420,7 +1422,7 @@ class TypeSpecTest { | public val v: Int |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1428,7 +1430,7 @@ class TypeSpecTest { val classA = TypeSpec.expectClassBuilder("ClassA") .addFunction( FunSpec.builder("test") - .build() + .build(), ) .build() @@ -1438,7 +1440,7 @@ class TypeSpecTest { | public fun test(): kotlin.Unit |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1448,9 +1450,9 @@ class TypeSpecTest { TypeSpec.companionObjectBuilder() .addFunction( FunSpec.builder("test") - .build() + .build(), ) - .build() + .build(), ) .build() @@ -1462,7 +1464,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1472,9 +1474,9 @@ class TypeSpecTest { TypeSpec.classBuilder("ClassB") .addFunction( FunSpec.builder("test") - .build() + .build(), ) - .build() + .build(), ) .build() @@ -1486,7 +1488,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1498,11 +1500,11 @@ class TypeSpecTest { TypeSpec.classBuilder("ClassC") .addFunction( FunSpec.builder("test") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() @@ -1516,7 +1518,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1530,13 +1532,13 @@ class TypeSpecTest { TypeSpec.classBuilder("ClassD") .addFunction( FunSpec.builder("test") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() @@ -1552,7 +1554,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1564,11 +1566,11 @@ class TypeSpecTest { TypeSpec.classBuilder("ClassC") .addFunction( FunSpec.constructorBuilder() - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() @@ -1582,7 +1584,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1596,13 +1598,13 @@ class TypeSpecTest { TypeSpec.classBuilder("ClassD") .addFunction( FunSpec.constructorBuilder() - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() @@ -1618,7 +1620,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1627,13 +1629,13 @@ class TypeSpecTest { .addFunction( FunSpec.builder("aMethod") .addModifiers(KModifier.ABSTRACT) - .build() + .build(), ) .addFunction(FunSpec.builder("aDefaultMethod").build()) .addFunction( FunSpec.builder("aPrivateMethod") .addModifiers(KModifier.PRIVATE) - .build() + .build(), ) .build() @@ -1653,22 +1655,26 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @Test fun referencedAndDeclaredSimpleNamesConflict() { val internalTop = PropertySpec.builder( - "internalTop", ClassName(tacosPackage, "Top") + "internalTop", + ClassName(tacosPackage, "Top"), ).build() val internalBottom = PropertySpec.builder( - "internalBottom", ClassName(tacosPackage, "Top", "Middle", "Bottom") + "internalBottom", + ClassName(tacosPackage, "Top", "Middle", "Bottom"), ).build() val externalTop = PropertySpec.builder( - "externalTop", ClassName(donutsPackage, "Top") + "externalTop", + ClassName(donutsPackage, "Top"), ).build() val externalBottom = PropertySpec.builder( - "externalBottom", ClassName(donutsPackage, "Bottom") + "externalBottom", + ClassName(donutsPackage, "Bottom"), ).build() val top = TypeSpec.classBuilder("Top") .addProperty(internalTop) @@ -1687,9 +1693,9 @@ class TypeSpecTest { .addProperty(internalBottom) .addProperty(externalTop) .addProperty(externalBottom) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(toString(top)).isEqualTo( @@ -1728,16 +1734,18 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @Test fun simpleNamesConflictInThisAndOtherPackage() { val internalOther = PropertySpec.builder( - "internalOther", ClassName(tacosPackage, "Other") + "internalOther", + ClassName(tacosPackage, "Other"), ).build() val externalOther = PropertySpec.builder( - "externalOther", ClassName(donutsPackage, "Other") + "externalOther", + ClassName(donutsPackage, "Other"), ).build() val gen = TypeSpec.classBuilder("Gen") .addProperty(internalOther) @@ -1753,7 +1761,7 @@ class TypeSpecTest { | public val externalOther: com.squareup.donuts.Other |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1765,7 +1773,7 @@ class TypeSpecTest { .addTypeVariable(typeVariable) .returns(typeVariable) .addStatement("return null") - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -1779,7 +1787,7 @@ class TypeSpecTest { | public fun <T> getComparator(): T where T : Comparator, T : Serializable = null |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1797,7 +1805,7 @@ class TypeSpecTest { | public val ints: IntArray |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1809,7 +1817,7 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("soft", Boolean::class) .addKdoc("True for a soft flour tortilla; false for a crunchy corn tortilla.\n") - .build() + .build(), ) .addFunction( FunSpec.builder("refold") @@ -1817,10 +1825,10 @@ class TypeSpecTest { "Folds the back of this taco to reduce sauce leakage.\n" + "\n" + "For [%T#KOREAN], the front may also be folded.\n", - Locale::class + Locale::class, ) .addParameter("locale", Locale::class) - .build() + .build(), ) .build() // Mentioning a type in KDoc will not cause an import to be added (java.util.Random here), but @@ -1853,7 +1861,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1874,36 +1882,36 @@ class TypeSpecTest { |the Andes, or hot with lava-like cheese from the depths of |the Ninth Circle. | - """.trimMargin() - ) + """.trimMargin(), + ), ) - .build() + .build(), ) .addParameter("soft", Boolean::class) .addParameter( ParameterSpec.builder("mild", Boolean::class) .addKdoc(CodeBlock.of("%L", "Whether the taco is mild (ew) or crunchy (ye).\n")) - .build() + .build(), ) .addParameter("nodoc", Int::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("soft", Boolean::class) .addKdoc("True for a soft flour tortilla; false for a crunchy corn tortilla.\n") .initializer("soft") - .build() + .build(), ) .addProperty( PropertySpec.builder("mild", Boolean::class) .addKdoc("No one likes mild tacos.") .initializer("mild") - .build() + .build(), ) .addProperty( PropertySpec.builder("nodoc", Int::class, KModifier.PRIVATE) .initializer("nodoc") - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -1939,7 +1947,7 @@ class TypeSpecTest { | private val nodoc: Int, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -1953,7 +1961,8 @@ class TypeSpecTest { AnnotationSpec.builder(mealDeal) .addMember("%L = %L", "price", 500) .addMember( - "%L = [%L, %L]", "options", + "%L = [%L, %L]", + "options", AnnotationSpec.builder(option) .addMember("%S", "taco") .addMember("%T::class", beef) @@ -1961,9 +1970,9 @@ class TypeSpecTest { AnnotationSpec.builder(option) .addMember("%S", "quesadilla") .addMember("%T::class", chicken) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(toString(menu)).isEqualTo( @@ -1976,7 +1985,7 @@ class TypeSpecTest { |) |public class Menu | - """.trimMargin() + """.trimMargin(), ) } @@ -1986,7 +1995,7 @@ class TypeSpecTest { FunSpec.builder("prepare") .addParameter("workers", Int::class) .addParameter("jobs", Runnable::class.asClassName(), VARARG) - .build() + .build(), ) .build() assertThat(toString(taqueria)).isEqualTo( @@ -2002,7 +2011,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2013,7 +2022,7 @@ class TypeSpecTest { .addParameter("workers", Int::class) .addParameter("jobs", Runnable::class.asClassName(), VARARG) .addParameter("start", Boolean::class.asClassName()) - .build() + .build(), ) .build() assertThat(toString(taqueria)).isEqualTo( @@ -2034,7 +2043,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2063,7 +2072,7 @@ class TypeSpecTest { .build() val escapeHtml = PropertySpec.builder( "ESCAPE_HTML", - Map::class.parameterizedBy(String::class, String::class) + Map::class.parameterizedBy(String::class, String::class), ) .addModifiers(KModifier.PRIVATE) .initializer(propertyBlock) @@ -2076,7 +2085,7 @@ class TypeSpecTest { .addParameter("listA", List::class.parameterizedBy(String::class)) .addParameter("listB", List::class.parameterizedBy(String::class)) .addCode(funBody) - .build() + .build(), ) .build() assertThat(toString(util)).isEqualTo( @@ -2111,7 +2120,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2124,7 +2133,7 @@ class TypeSpecTest { .nextControlFlow("else if (%1L.%3L && %2L.%3L)", "taco", "otherTaco", "isSupreme()") .addStatement("%T.out.println(%S)", System::class, "taco heaven") .endControlFlow() - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2144,7 +2153,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2157,7 +2166,7 @@ class TypeSpecTest { .nextControlFlow("else if (5 < 6)") .addStatement("%T.out.println(%S)", System::class, "hello") .endControlFlow() - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2177,7 +2186,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2186,7 +2195,7 @@ class TypeSpecTest { .addFunction( FunSpec.builder("inlineIndent") .addCode("if (3 < 4) {\n⇥%T.out.println(%S);\n⇤}\n", System::class, "hello") - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2204,7 +2213,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2212,16 +2221,16 @@ class TypeSpecTest { val taco = TypeSpec.classBuilder("Taco") .addType( TypeSpec.classBuilder("Meat") - .build() + .build(), ) .addType( TypeSpec.interfaceBuilder("Tortilla") - .build() + .build(), ) .addType( TypeSpec.enumBuilder("Topping") .addEnumConstant("SALSA") - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2238,7 +2247,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2256,12 +2265,12 @@ class TypeSpecTest { .addFunction( FunSpec.constructorBuilder() .addParameter("p", Int::class) - .build() + .build(), ) .addFunction( FunSpec.constructorBuilder() .addParameter("o", Long::class) - .build() + .build(), ) .build() // Static properties, instance properties, constructors, functions, classes. @@ -2300,7 +2309,7 @@ class TypeSpecTest { | public class Y |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2310,7 +2319,7 @@ class TypeSpecTest { FunSpec.builder("nativeInt") .addModifiers(KModifier.EXTERNAL) .returns(Int::class) - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2323,7 +2332,7 @@ class TypeSpecTest { | public external fun nativeInt(): Int |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2332,7 +2341,7 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("NULL", String::class) .initializer("%S", null) - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2345,7 +2354,7 @@ class TypeSpecTest { | public val NULL: String = null |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2391,7 +2400,7 @@ class TypeSpecTest { "" + "public constructor(taco: com.squareup.tacos.Taco) {\n" + " this.taco = taco\n" + - "}\n" + "}\n", ) } @@ -2409,7 +2418,7 @@ class TypeSpecTest { .build() assertThat(type.toString()).isEqualTo( "" + - "public class Taco\n" + "public class Taco\n", ) } @@ -2419,7 +2428,7 @@ class TypeSpecTest { .addFunction( FunSpec.builder("run") .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE) - .build() + .build(), ) .build() assertThat(type.toString()).isEqualTo( @@ -2428,7 +2437,7 @@ class TypeSpecTest { | public override fun run(): kotlin.Unit { | } |} - """.trimMargin() + """.trimMargin(), ) } @@ -2439,7 +2448,7 @@ class TypeSpecTest { """ |public interface Taco | - """.trimMargin() + """.trimMargin(), ) } @@ -2450,7 +2459,7 @@ class TypeSpecTest { """ |public annotation class Taco | - """.trimMargin() + """.trimMargin(), ) } @@ -2466,10 +2475,14 @@ class TypeSpecTest { .returns(String::class) .addStatement( "val result = %S\n+ %S\n+ %S\n+ %S\n+ %S", - "Taco(", "beef,", "lettuce,", "cheese", ")" + "Taco(", + "beef,", + "lettuce,", + "cheese", + ")", ) .addStatement("return result") - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2489,7 +2502,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2506,7 +2519,7 @@ class TypeSpecTest { .addParameter("b", String::class) .addComment("Prefix the strings and compare them") .addStatement("return a.substring(0, length)\n" + ".compareTo(b.substring(0, length))") - .build() + .build(), ) .build() val taco = TypeSpec.classBuilder("Taco") @@ -2516,14 +2529,14 @@ class TypeSpecTest { .addParameter("length", Int::class) .addComment("Return a new comparator for the target length.") .addStatement("return %L", prefixComparator) - .build() + .build(), ) .addFunction( FunSpec.builder("sortPrefix") .addParameter("list", listOfString) .addParameter("length", Int::class) .addStatement("%T.sort(\nlist,\n%L)", Collections::class, prefixComparator) - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2562,7 +2575,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2571,7 +2584,7 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("toppings", String::class) .initializer("%S", "shell\nbeef\nlettuce\ncheese\n") - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2589,7 +2602,7 @@ class TypeSpecTest { | |${"\"\"\""}.trimMargin() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2600,8 +2613,8 @@ class TypeSpecTest { AnnotationSpec.builder(SuppressWarnings::class) .addMember("%S", "unchecked") .build(), - AnnotationSpec.builder(Deprecated::class).build() - ) + AnnotationSpec.builder(Deprecated::class).build(), + ), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2615,7 +2628,7 @@ class TypeSpecTest { |@Deprecated |public class Taco | - """.trimMargin() + """.trimMargin(), ) } @@ -2624,8 +2637,8 @@ class TypeSpecTest { .addProperties( listOf( PropertySpec.builder("ANSWER", Int::class, KModifier.CONST).build(), - PropertySpec.builder("price", BigDecimal::class, PRIVATE).build() - ) + PropertySpec.builder("price", BigDecimal::class, PRIVATE).build(), + ), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2641,7 +2654,7 @@ class TypeSpecTest { | private val price: BigDecimal |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2659,8 +2672,8 @@ class TypeSpecTest { .returns(Int::class) .addKdoc("chosen by fair dice roll ;)\n") .addStatement("return %L", 4) - .build() - ) + .build(), + ), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2678,7 +2691,7 @@ class TypeSpecTest { | public fun getRandomQuantity(): Int = 4 |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2687,8 +2700,8 @@ class TypeSpecTest { .addSuperinterfaces( listOf( Serializable::class.asTypeName(), - EventListener::class.asTypeName() - ) + EventListener::class.asTypeName(), + ), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2700,7 +2713,7 @@ class TypeSpecTest { | |public class Taco : Serializable, EventListener | - """.trimMargin() + """.trimMargin(), ) } @@ -2709,8 +2722,8 @@ class TypeSpecTest { .addTypeVariables( listOf( TypeVariableName("T"), - TypeVariableName("P", Number::class) - ) + TypeVariableName("P", Number::class), + ), ) .build() assertThat(toString(location)).isEqualTo( @@ -2721,7 +2734,7 @@ class TypeSpecTest { | |public class Location<T, P : Number> | - """.trimMargin() + """.trimMargin(), ) } @@ -2730,8 +2743,8 @@ class TypeSpecTest { .addTypes( listOf( TypeSpec.classBuilder("Topping").build(), - TypeSpec.classBuilder("Sauce").build() - ) + TypeSpec.classBuilder("Sauce").build(), + ), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2744,7 +2757,7 @@ class TypeSpecTest { | public class Sauce |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2757,10 +2770,10 @@ class TypeSpecTest { .addCode("/* do something tricky with the topping */\n") .nextControlFlow( "catch (e: %T)", - ClassName("com.squareup.tacos", "IllegalToppingException") + ClassName("com.squareup.tacos", "IllegalToppingException"), ) .endControlFlow() - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2778,7 +2791,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2793,7 +2806,7 @@ class TypeSpecTest { .nextControlFlow("else") .addStatement("return false") .endControlFlow() - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2813,7 +2826,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -2828,7 +2841,7 @@ class TypeSpecTest { .addStatement("%S -> 3", "cheese") .addStatement("else -> throw IllegalToppingException(topping)") .endControlFlow() - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -2846,7 +2859,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3012,14 +3025,14 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("FOO", String::class, KModifier.PRIVATE, KModifier.CONST) .initializer("%S", "FOO") - .build() + .build(), ) .addFunction( FunSpec.builder("toString") .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE) .returns(String::class) .addStatement("return FOO") - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -3036,7 +3049,7 @@ class TypeSpecTest { | public override fun toString(): String = FOO |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3046,7 +3059,7 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("FOO", String::class, KModifier.PRIVATE, KModifier.CONST) .initializer("%S", "FOO") - .build() + .build(), ) .addFunction(FunSpec.constructorBuilder().build()) .addFunction( @@ -3054,12 +3067,12 @@ class TypeSpecTest { .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE) .returns(String::class) .addStatement("return FOO") - .build() + .build(), ) .addInitializerBlock( CodeBlock.builder() .addStatement("foo = %S", "FOO") - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -3082,7 +3095,7 @@ class TypeSpecTest { | public override fun toString(): String = FOO |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3093,7 +3106,7 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("FOO", String::class, KModifier.PRIVATE, KModifier.CONST) .initializer("%S", "FOO") - .build() + .build(), ) .addFunction(FunSpec.constructorBuilder().build()) .addFunction( @@ -3101,7 +3114,7 @@ class TypeSpecTest { .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE) .returns(String::class) .addStatement("return FOO") - .build() + .build(), ) .build() @@ -3112,7 +3125,7 @@ class TypeSpecTest { .addInitializerBlock( CodeBlock.builder() .addStatement("foo = %S", "instanceFoo") - .build() + .build(), ) .build() @@ -3136,7 +3149,7 @@ class TypeSpecTest { | public override fun toString(): String = FOO |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3149,26 +3162,26 @@ class TypeSpecTest { .addTypeVariable(TypeVariableName.of("State", listOf(ANY), IN).copy(reified = true)) .addType( TypeSpec.companionObjectBuilder() - .build() + .build(), ) .addType( TypeSpec.classBuilder("InnerTaco") .addModifiers(INNER) - .build() + .build(), ) .primaryConstructor( FunSpec.constructorBuilder() - .build() + .build(), ) .superclass(ClassName("texmexfood", "TortillaBased")) .addSuperclassConstructorParameter("true") .addProperty( PropertySpec.builder("meat", ClassName("texmexfood", "Meat")) - .build() + .build(), ) .addFunction( FunSpec.builder("fold") - .build() + .build(), ) .addSuperinterface(ClassName("texmexfood", "Consumable")) .addOriginatingElement(originatingElement) @@ -3203,14 +3216,14 @@ class TypeSpecTest { FunSpec.constructorBuilder() .addParameter( ParameterSpec.builder("test", Int::class) - .build() + .build(), ) - .build() + .build(), ) .addProperty( PropertySpec.builder("test", Int::class) .initializer("test") - .build() + .build(), ) .build() assertThat(annotation.toBuilder().build()).isEqualTo(annotation) @@ -3222,13 +3235,13 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("value", Int::class) - .build() + .build(), ) .addProperty(PropertySpec.builder("value", Int::class).build()) .addFunction( FunSpec.builder("get") .returns(Int::class) - .build() + .build(), ) .build() assertThat(expectSpec.toBuilder().build()).isEqualTo(expectSpec) @@ -3242,7 +3255,7 @@ class TypeSpecTest { .addFunction( FunSpec.builder("test") .addModifiers(KModifier.PUBLIC) - .build() + .build(), ) .build() assertThat(objectSpec.toBuilder().build()).isEqualTo(objectSpec) @@ -3254,7 +3267,7 @@ class TypeSpecTest { .addFunction( FunSpec.builder("run") .addModifiers(KModifier.PUBLIC, KModifier.OVERRIDE) - .build() + .build(), ) .build() assertThat(anonObjectSpec.toBuilder().build()).isEqualTo(anonObjectSpec) @@ -3309,7 +3322,7 @@ class TypeSpecTest { .addFunction( FunSpec.builder("test") .addModifiers(KModifier.PUBLIC) - .build() + .build(), ) .build() @@ -3330,7 +3343,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3343,7 +3356,7 @@ class TypeSpecTest { .addFunction( FunSpec.builder("test") .addModifiers(KModifier.PUBLIC) - .build() + .build(), ) .build() @@ -3362,7 +3375,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3371,12 +3384,12 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("tacos", Int::class) .initializer("%L", 42) - .build() + .build(), ) .addFunction( FunSpec.builder("test") .addModifiers(KModifier.PUBLIC) - .build() + .build(), ) .build() @@ -3401,7 +3414,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3411,12 +3424,12 @@ class TypeSpecTest { PropertySpec.builder("tacos", Int::class) .mutable() .initializer("%L", 24) - .build() + .build(), ) .addInitializerBlock( CodeBlock.builder() .addStatement("tacos = %L", 42) - .build() + .build(), ) .build() @@ -3441,7 +3454,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3467,7 +3480,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3476,7 +3489,7 @@ class TypeSpecTest { .addFunction( FunSpec.builder("test") .addModifiers(KModifier.PUBLIC) - .build() + .build(), ) .build() @@ -3498,7 +3511,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3507,7 +3520,7 @@ class TypeSpecTest { .addFunction( FunSpec.builder("test") .addModifiers(KModifier.PUBLIC) - .build() + .build(), ) .build() @@ -3535,7 +3548,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3544,7 +3557,7 @@ class TypeSpecTest { .addFunction( FunSpec.builder("test") .addModifiers(KModifier.PUBLIC) - .build() + .build(), ) .build() @@ -3564,7 +3577,7 @@ class TypeSpecTest { .addFunction( FunSpec.builder("test") .addModifiers(KModifier.PUBLIC) - .build() + .build(), ) .build() @@ -3587,7 +3600,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3597,17 +3610,17 @@ class TypeSpecTest { FunSpec.constructorBuilder() .addParameter("a", Int::class) .addParameter("b", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("a", Int::class) .initializer("a") - .build() + .build(), ) .addProperty( PropertySpec.builder("b", String::class) .initializer("b") - .build() + .build(), ) .build() @@ -3623,7 +3636,7 @@ class TypeSpecTest { | public val b: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -3633,18 +3646,18 @@ class TypeSpecTest { FunSpec.constructorBuilder() .addParameter("a", Int::class) .addParameter("b", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("a", Int::class) .initializer("a") .addKdoc("KDoc\n") - .build() + .build(), ) .addProperty( PropertySpec.builder("b", String::class) .initializer("b") - .build() + .build(), ) .build() @@ -3663,7 +3676,7 @@ class TypeSpecTest { | public val b: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -3673,7 +3686,7 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addAnnotation(AnnotationSpec.builder(injectAnnotation).build()) - .build() + .build(), ) .build() @@ -3685,7 +3698,7 @@ class TypeSpecTest { | |public class Taco @Inject constructor() | - """.trimMargin() + """.trimMargin(), ) } @@ -3694,7 +3707,7 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addModifiers(INTERNAL) - .build() + .build(), ) .build() @@ -3704,7 +3717,7 @@ class TypeSpecTest { | |public class Taco internal constructor() | - """.trimMargin() + """.trimMargin(), ) } @@ -3715,7 +3728,7 @@ class TypeSpecTest { FunSpec.constructorBuilder() .addAnnotation(AnnotationSpec.builder(injectAnnotation).build()) .addModifiers(INTERNAL) - .build() + .build(), ) .build() @@ -3727,7 +3740,7 @@ class TypeSpecTest { | |public class Taco @Inject internal constructor() | - """.trimMargin() + """.trimMargin(), ) } @@ -3740,7 +3753,7 @@ class TypeSpecTest { .addAnnotation(AnnotationSpec.builder(injectAnnotation).build()) .addAnnotation(AnnotationSpec.builder(namedAnnotation).build()) .addModifiers(INTERNAL) - .build() + .build(), ) .build() @@ -3753,7 +3766,7 @@ class TypeSpecTest { | |public class Taco @Inject @Named internal constructor() | - """.trimMargin() + """.trimMargin(), ) } @@ -3763,12 +3776,12 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("taco", type.copy(nullable = false)) .initializer("%S", "taco") - .build() + .build(), ) .addProperty( PropertySpec.builder("nullTaco", type.copy(nullable = true)) .initializer("null") - .build() + .build(), ) .build() @@ -3784,7 +3797,7 @@ class TypeSpecTest { | public val nullTaco: String? = null |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3801,7 +3814,7 @@ class TypeSpecTest { | |public class Foo : Bar("foo", 42) | - """.trimMargin() + """.trimMargin(), ) } @@ -3828,7 +3841,7 @@ class TypeSpecTest { | public constructor() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3845,7 +3858,7 @@ class TypeSpecTest { | |public class IoException : Exception() | - """.trimMargin() + """.trimMargin(), ) } @@ -3857,7 +3870,7 @@ class TypeSpecTest { .addFunction(FunSpec.constructorBuilder().build()) .build() }.hasMessageThat().isEqualTo( - "types without a primary constructor cannot specify secondary constructors and superclass constructor parameters" + "types without a primary constructor cannot specify secondary constructors and superclass constructor parameters", ) } @@ -3868,25 +3881,25 @@ class TypeSpecTest { .addParameter( ParameterSpec.builder("a", Int::class) .defaultValue("1") - .build() + .build(), ) .addParameter( ParameterSpec .builder("b", String::class.asTypeName().copy(nullable = true)) .defaultValue("null") - .build() + .build(), ) - .build() + .build(), ) .addProperty( PropertySpec.builder("a", Int::class) .initializer("a") - .build() + .build(), ) .addProperty( PropertySpec.builder("b", String::class.asTypeName().copy(nullable = true)) .initializer("b") - .build() + .build(), ) .build() @@ -3902,7 +3915,7 @@ class TypeSpecTest { | public val b: String? = null, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -3913,22 +3926,22 @@ class TypeSpecTest { .addParameter("a", String::class.asTypeName().copy(nullable = true)) .addParameter("b", String::class.asTypeName().copy(nullable = true)) .addParameter("c", String::class.asTypeName().copy(nullable = true)) - .build() + .build(), ) .addProperty( PropertySpec.builder("a", String::class.asTypeName().copy(nullable = true)) .initializer("a") - .build() + .build(), ) .addProperty( PropertySpec.builder("b", String::class.asTypeName().copy(nullable = true)) .initializer("b") - .build() + .build(), ) .addProperty( PropertySpec.builder("c", String::class.asTypeName().copy(nullable = true)) .initializer("c") - .build() + .build(), ) .addFunction( FunSpec.constructorBuilder() @@ -3936,9 +3949,9 @@ class TypeSpecTest { .callThisConstructor( CodeBlock.of("map[%S]", "a"), CodeBlock.of("map[%S]", "b"), - CodeBlock.of("map[%S]", "c") + CodeBlock.of("map[%S]", "c"), ) - .build() + .build(), ) .build() @@ -3957,7 +3970,7 @@ class TypeSpecTest { | public constructor(map: Map<String, String>) : this(map["a"], map["b"], map["c"]) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -3968,7 +3981,7 @@ class TypeSpecTest { type.addFunction( FunSpec.builder("eat") .addModifiers(ABSTRACT, INTERNAL) - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo("modifiers [ABSTRACT, INTERNAL] must contain none of [INTERNAL, PROTECTED]") @@ -3978,8 +3991,8 @@ class TypeSpecTest { listOf( FunSpec.builder("eat") .addModifiers(ABSTRACT, INTERNAL) - .build() - ) + .build(), + ), ) .build() }.hasMessageThat().isEqualTo("modifiers [ABSTRACT, INTERNAL] must contain none of [INTERNAL, PROTECTED]") @@ -3992,7 +4005,7 @@ class TypeSpecTest { type.addFunction( FunSpec.builder("eat") .addModifiers(ABSTRACT, PRIVATE) - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo("modifiers [ABSTRACT, PRIVATE] must contain none or only one of [ABSTRACT, PRIVATE]") @@ -4002,8 +4015,8 @@ class TypeSpecTest { listOf( FunSpec.builder("eat") .addModifiers(ABSTRACT, PRIVATE) - .build() - ) + .build(), + ), ) .build() }.hasMessageThat().isEqualTo("modifiers [ABSTRACT, PRIVATE] must contain none or only one of [ABSTRACT, PRIVATE]") @@ -4016,7 +4029,7 @@ class TypeSpecTest { type.addFunction( FunSpec.builder("eat") .addModifiers(INTERNAL) - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo("annotation class Taco.eat requires modifiers [PUBLIC, ABSTRACT]") @@ -4026,8 +4039,8 @@ class TypeSpecTest { listOf( FunSpec.builder("eat") .addModifiers(INTERNAL) - .build() - ) + .build(), + ), ) .build() }.hasMessageThat().isEqualTo("annotation class Taco.eat requires modifiers [PUBLIC, ABSTRACT]") @@ -4041,22 +4054,22 @@ class TypeSpecTest { .addParameter("id", Int::class) .addParameter("name", String::class) .addParameter("surname", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("id", Int::class, KModifier.OVERRIDE) .initializer("id") - .build() + .build(), ) .addProperty( PropertySpec.builder("name", String::class, KModifier.OVERRIDE) .initializer("name") - .build() + .build(), ) .addProperty( PropertySpec.builder("surname", String::class, KModifier.OVERRIDE) .initializer("surname") - .build() + .build(), ) .build() @@ -4073,7 +4086,7 @@ class TypeSpecTest { | public override val surname: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -4089,14 +4102,14 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter(idParameterSpec) - .build() + .build(), ) .addProperty( PropertySpec.builder("id", Int::class) .addModifiers(PRIVATE) .initializer("id") .addAnnotation(ClassName("com.squareup.kotlinpoet", "OrderBy")) - .build() + .build(), ) .build() @@ -4114,7 +4127,7 @@ class TypeSpecTest { | private val id: Int = 1, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -4126,26 +4139,26 @@ class TypeSpecTest { CodeBlock.of( "%L", PropertySpec.builder("taco1", String::class.asTypeName()) - .initializer("%S", "Taco!").build() - ) + .initializer("%S", "Taco!").build(), + ), ) .addCode( CodeBlock.of( "%L", PropertySpec.builder("taco2", String::class.asTypeName().copy(nullable = true)) .initializer("null") - .build() - ) + .build(), + ), ) .addCode( CodeBlock.of( "%L", PropertySpec.builder("taco3", String::class.asTypeName(), KModifier.LATEINIT) .mutable() - .build() - ) + .build(), + ), ) - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -4163,7 +4176,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -4172,11 +4185,11 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("somethingElse", String::class) - .build() + .build(), ) .addSuperinterface( Consumer::class.parameterizedBy(String::class), - CodeBlock.of("({ println(it) })") + CodeBlock.of("({ println(it) })"), ) .build() @@ -4199,7 +4212,7 @@ class TypeSpecTest { val type = TypeSpec.objectBuilder("Guac") .addSuperinterface( Consumer::class.parameterizedBy(String::class), - CodeBlock.of("({ println(it) })") + CodeBlock.of("({ println(it) })"), ) .build() @@ -4220,15 +4233,15 @@ class TypeSpecTest { val type = TypeSpec.classBuilder("StringToInteger") .primaryConstructor( FunSpec.constructorBuilder() - .build() + .build(), ) .addSuperinterface( Function::class.parameterizedBy(String::class, Int::class), - CodeBlock.of("Function ({ text -> text.toIntOrNull() ?: 0 })") + CodeBlock.of("Function ({ text -> text.toIntOrNull() ?: 0 })"), ) .addSuperinterface( Runnable::class, - CodeBlock.of("Runnable ({ %T.debug(\"Hello world\") })", Logger::class.asTypeName()) + CodeBlock.of("Runnable ({ %T.debug(\"Hello world\") })", Logger::class.asTypeName()), ) .build() @@ -4255,7 +4268,7 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("other", String::class) - .build() + .build(), ) .addSuperinterface(KFunction::class, "notOther") .build() @@ -4275,7 +4288,7 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("superString", Function::class) - .build() + .build(), ) .addSuperinterface(Function::class, "superString") .build() @@ -4290,7 +4303,7 @@ class TypeSpecTest { | superString: Function, |) : Function by superString | - """.trimMargin() + """.trimMargin(), ) } @@ -4300,7 +4313,7 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("superString", Function::class) - .build() + .build(), ) .addSuperinterface(Function::class, CodeBlock.of("{ print(Hello) }")) .addSuperinterface(Function::class, "superString") @@ -4308,7 +4321,7 @@ class TypeSpecTest { fail() }.hasMessageThat().isEqualTo( "'Taco' can not delegate to kotlin.Function " + - "by superString with existing declaration by { print(Hello) }" + "by superString with existing declaration by { print(Hello) }", ) } @@ -4322,17 +4335,17 @@ class TypeSpecTest { ParameterSpec.builder( "argBuilder", ClassName(tacosPackage, "Payload") - .parameterizedBy(entityBuilder, entity) + .parameterizedBy(entityBuilder, entity), ) .defaultValue("Payload.create()") - .build() + .build(), ) - .build() + .build(), ) .addSuperinterface( ClassName(tacosPackage, "TypeBuilder") .parameterizedBy(entityBuilder, entity), - "argBuilder" + "argBuilder", ) .build() @@ -4344,7 +4357,7 @@ class TypeSpecTest { | argBuilder: Payload<EntityBuilder, Entity> = Payload.create(), |) : TypeBuilder<EntityBuilder, Entity> by argBuilder | - """.trimMargin() + """.trimMargin(), ) } @@ -4364,7 +4377,7 @@ class TypeSpecTest { | public fun bar(): Unit |} | - """.trimMargin() + """.trimMargin(), ) } @@ -4388,7 +4401,7 @@ class TypeSpecTest { | public fun bar(): Unit |} | - """.trimMargin() + """.trimMargin(), ) } @@ -4412,7 +4425,7 @@ class TypeSpecTest { | public fun bar(): Unit |} | - """.trimMargin() + """.trimMargin(), ) } @@ -4426,16 +4439,16 @@ class TypeSpecTest { TypeSpec.objectBuilder("Nested2") .addModifiers(KModifier.EXTERNAL) .addFunction(FunSpec.builder("bar").addModifiers(KModifier.EXTERNAL).build()) - .build() + .build(), ) .addFunction(FunSpec.builder("baz").addModifiers(KModifier.EXTERNAL).build()) - .build() + .build(), ) .addType( TypeSpec.companionObjectBuilder() .addModifiers(KModifier.EXTERNAL) .addFunction(FunSpec.builder("qux").addModifiers(KModifier.EXTERNAL).build()) - .build() + .build(), ) .build() @@ -4459,7 +4472,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -4481,7 +4494,7 @@ class TypeSpecTest { """ |public class `With-Hyphen` | - """.trimMargin() + """.trimMargin(), ) } @@ -4493,8 +4506,8 @@ class TypeSpecTest { TypeSpec.companionObjectBuilder() .build(), TypeSpec.companionObjectBuilder() - .build() - ) + .build(), + ), ) .build() } @@ -4515,21 +4528,21 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("madeFreshDatabaseDate", sqlTaco) .initializer("madeFreshDatabaseDate") - .build() + .build(), ) .primaryConstructor( FunSpec.constructorBuilder() .addParameter("madeFreshDatabaseDate", sqlTaco) .addParameter("fooNt", INT) - .build() + .build(), ) .addFunction( FunSpec.constructorBuilder() .addParameter("anotherTaco", ClassName("com.squareup.tacos", "Taco")) .callThisConstructor(CodeBlock.of("%T.defaultInstance(), 0", sqlTaco)) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(source.toString()).isEqualTo( @@ -4545,7 +4558,7 @@ class TypeSpecTest { | public constructor(anotherTaco: Taco) : this(java.sql.Taco.defaultInstance(), 0) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -4554,7 +4567,7 @@ class TypeSpecTest { .addAnnotation( AnnotationSpec.builder(JvmName::class.asClassName()) .addMember("name = %S", "jvmWord") - .build() + .build(), ) val javaWord = AnnotationSpec.builder(JvmName::class.asClassName()) @@ -4651,7 +4664,7 @@ class TypeSpecTest { """ |public enum class Topping | - """.trimMargin() + """.trimMargin(), ) } @@ -4667,7 +4680,7 @@ class TypeSpecTest { | */ |public class Foo | - """.trimMargin() + """.trimMargin(), ) } @@ -4676,7 +4689,7 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("bar", String::class) .addKdoc("The bar for your foo") - .build() + .build(), ) .build() assertThat(typeSpec.toString()).isEqualTo( @@ -4688,7 +4701,7 @@ class TypeSpecTest { | public val bar: kotlin.String |} | - """.trimMargin() + """.trimMargin(), ) } @@ -4699,17 +4712,17 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("first", INT) .initializer("first") - .build() + .build(), ) .addProperty( PropertySpec.builder("second", INT) .initializer("second") - .build() + .build(), ) .addProperty( PropertySpec.builder("third", INT) .initializer("third") - .build() + .build(), ) .primaryConstructor( FunSpec.constructorBuilder() @@ -4717,19 +4730,19 @@ class TypeSpecTest { .addParameter( ParameterSpec.builder("first", INT) .addKdoc("the first thing") - .build() + .build(), ) .addParameter( ParameterSpec.builder("second", INT) .addKdoc("the second thing") - .build() + .build(), ) .addParameter( ParameterSpec.builder("third", INT) .addKdoc("the third thing") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(typeSpec.toString()).isEqualTo( @@ -4752,7 +4765,7 @@ class TypeSpecTest { | public val third: kotlin.Int, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -4763,9 +4776,9 @@ class TypeSpecTest { .addParameter( ParameterSpec.builder("first", INT) .addKdoc("the first thing") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(typeSpec.toString()).isEqualTo( @@ -4777,7 +4790,7 @@ class TypeSpecTest { | first: kotlin.Int, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -4789,10 +4802,10 @@ class TypeSpecTest { .returns(Int::class) .addComment( "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do " + - "eiusmod tempor incididunt ut labore et dolore magna aliqua." + "eiusmod tempor incididunt ut labore et dolore magna aliqua.", ) .addStatement("return 42") - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -4808,7 +4821,7 @@ class TypeSpecTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -4820,7 +4833,7 @@ class TypeSpecTest { .addType( TypeSpec.classBuilder("Inner") .addOriginatingElement(innerElement) - .build() + .build(), ) .build() assertThat(outer.originatingElements).containsExactly(outerElement, innerElement) @@ -4839,7 +4852,7 @@ class TypeSpecTest { | `0constants`, |} | - """.trimMargin() + """.trimMargin(), ) } @@ -4863,7 +4876,7 @@ class TypeSpecTest { public val tacos: Int } - """.trimIndent() + """.trimIndent(), ) } @@ -4890,7 +4903,7 @@ class TypeSpecTest { public val tacos2: Int } - """.trimIndent() + """.trimIndent(), ) } @@ -4914,7 +4927,7 @@ class TypeSpecTest { } } - """.trimIndent() + """.trimIndent(), ) } @@ -4924,18 +4937,18 @@ class TypeSpecTest { FunSpec.constructorBuilder() .addParameter("tacos1", Int::class) .addParameter("tacos2", Int::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("tacos1", Int::class) .initializer("tacos1") - .build() + .build(), ) .addInitializerBlock(CodeBlock.builder().build()) .addProperty( PropertySpec.builder("tacos2", Int::class) .initializer("tacos2") - .build() + .build(), ) .build() @@ -4956,7 +4969,7 @@ class TypeSpecTest { public val tacos2: Int = tacos2 } - """.trimIndent() + """.trimIndent(), ) } @@ -4968,15 +4981,15 @@ class TypeSpecTest { .addParameter( ParameterSpec.builder("mild", Boolean::class) .addKdoc(CodeBlock.of("%L", "Whether the taco is mild (ew) or crunchy (ye).\n")) - .build() + .build(), ) - .build() + .build(), ) .addProperty( PropertySpec.builder("mild", Boolean::class) .addKdoc("No one likes mild tacos.") .initializer("mild") - .build() + .build(), ) .build() assertThat(toString(taco)).isEqualTo( @@ -4995,7 +5008,7 @@ class TypeSpecTest { | public val mild: Boolean, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -5013,7 +5026,7 @@ class TypeSpecTest { | `object`, |} | - """.trimMargin() + """.trimMargin(), ) } @@ -5029,13 +5042,13 @@ class TypeSpecTest { "header", TypeSpec.anonymousClassBuilder() .addSuperclassConstructorParameter("%L", 1) - .build() + .build(), ) .addEnumConstant( "impl", TypeSpec.anonymousClassBuilder() .addSuperclassConstructorParameter("%L", 2) - .build() + .build(), ) .build() assertThat(toString(enum)).isEqualTo( @@ -5051,7 +5064,7 @@ class TypeSpecTest { | `impl`(2), |} | - """.trimMargin() + """.trimMargin(), ) } @@ -5061,7 +5074,7 @@ class TypeSpecTest { """ |public class `fun` | - """.trimMargin() + """.trimMargin(), ) } @@ -5077,7 +5090,7 @@ class TypeSpecTest { | print(taco) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -5096,19 +5109,19 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("fooWithDefault", String::class) .initializer("%S", "defaultValue") - .build() + .build(), ) .addFunction( FunSpec.builder("bar") .addModifiers(ABSTRACT) .returns(String::class) - .build() + .build(), ) .addFunction( FunSpec.builder("barWithDefault") - .build() + .build(), ) - .build() + .build(), ) .build() // language=kotlin @@ -5130,7 +5143,7 @@ class TypeSpecTest { } } - """.trimIndent() + """.trimIndent(), ) } @@ -5147,7 +5160,7 @@ class TypeSpecTest { public class Taco() - """.trimIndent() + """.trimIndent(), ) } @@ -5156,7 +5169,7 @@ class TypeSpecTest { val taco = TypeSpec.classBuilder("TacoShim") .addSuperinterface( ClassName("test", "Taco"), - CodeBlock.of("%T", ClassName("test", "RealTaco")) + CodeBlock.of("%T", ClassName("test", "RealTaco")), ) .build() val file = FileSpec.builder("com.squareup.tacos", "Tacos") @@ -5171,7 +5184,7 @@ class TypeSpecTest { public class TacoShim : Taco by RealTaco - """.trimIndent() + """.trimIndent(), ) } @@ -5182,7 +5195,7 @@ class TypeSpecTest { .addEnumConstant("name") } assertThat(exception.message).isEqualTo( - "constant with name \"name\" conflicts with a supertype member with the same name" + "constant with name \"name\" conflicts with a supertype member with the same name", ) @Suppress("RemoveExplicitTypeArguments") @@ -5191,7 +5204,7 @@ class TypeSpecTest { .addEnumConstant("ordinal") } assertThat(exception.message).isEqualTo( - "constant with name \"ordinal\" conflicts with a supertype member with the same name" + "constant with name \"ordinal\" conflicts with a supertype member with the same name", ) } @@ -5202,7 +5215,7 @@ class TypeSpecTest { .addProperty("name", String::class) } assertThat(exception.message).isEqualTo( - "name is a final supertype member and can't be redeclared or overridden" + "name is a final supertype member and can't be redeclared or overridden", ) @Suppress("RemoveExplicitTypeArguments") @@ -5211,7 +5224,7 @@ class TypeSpecTest { .addProperty("ordinal", String::class) } assertThat(exception.message).isEqualTo( - "ordinal is a final supertype member and can't be redeclared or overridden" + "ordinal is a final supertype member and can't be redeclared or overridden", ) } @@ -5223,10 +5236,10 @@ class TypeSpecTest { .addProperty( PropertySpec.builder("rawValue", String::class) .initializer("%S", "") - .build() + .build(), ) .addEnumConstant("String") - .build() + .build(), ) .build() @@ -5241,7 +5254,7 @@ class TypeSpecTest { public val rawValue: kotlin.String = "" } - """.trimIndent() + """.trimIndent(), ) } @@ -5253,12 +5266,12 @@ class TypeSpecTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter(parameter) - .build() + .build(), ) .addProperty( PropertySpec.builder(parameter.name, STRING) .initializer("%N", parameter) - .build() + .build(), ) .build() assertThat(typeSpec.toString()).isEqualTo( @@ -5267,7 +5280,7 @@ class TypeSpecTest { public val `data`: kotlin.String, ) - """.trimIndent() + """.trimIndent(), ) } @@ -5281,7 +5294,7 @@ class TypeSpecTest { |context(kotlin.String) |public class Example | - """.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 4a45e3df..bca1a7cb 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeVariableNameTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/TypeVariableNameTest.kt @@ -36,7 +36,7 @@ class TypeVariableNameTest { """ |public fun <T> foo(): T? = null | - """.trimMargin() + """.trimMargin(), ) } @@ -51,7 +51,7 @@ class TypeVariableNameTest { """ |public fun <T, U> foo(): T? = null | - """.trimMargin() + """.trimMargin(), ) } @@ -65,7 +65,7 @@ class TypeVariableNameTest { """ |public fun <T : java.io.Serializable> foo(): T? = null | - """.trimMargin() + """.trimMargin(), ) } @@ -80,7 +80,7 @@ class TypeVariableNameTest { """ |public fun <T : java.io.Serializable, U : java.lang.Runnable> foo(): T? = null | - """.trimMargin() + """.trimMargin(), ) } @@ -94,7 +94,7 @@ class TypeVariableNameTest { """ |public fun <T> foo(): T? where T : java.io.Serializable, T : java.lang.Runnable = null | - """.trimMargin() + """.trimMargin(), ) } @@ -108,7 +108,7 @@ class TypeVariableNameTest { assertThat(funSpec.toString()).isEqualTo( "public fun <T, U> foo(): " + "T? where T : java.io.Serializable, T : java.lang.Runnable, " + - "U : java.util.Comparator, U : kotlin.Cloneable = null\n" + "U : java.util.Comparator, U : kotlin.Cloneable = null\n", ) } @@ -122,7 +122,7 @@ class TypeVariableNameTest { .build() assertThat(funSpec.toString()).isEqualTo( "public fun <T, U : kotlin.Cloneable, V> foo(): " + - "T? where T : java.io.Serializable, T : java.lang.Runnable = null\n" + "T? where T : java.io.Serializable, T : java.lang.Runnable = null\n", ) } @@ -134,7 +134,7 @@ class TypeVariableNameTest { """ |public class Taco<T : kotlin.Number> | - """.trimMargin() + """.trimMargin(), ) } @@ -146,7 +146,7 @@ class TypeVariableNameTest { """ |public class Taco<in E : kotlin.Number> | - """.trimMargin() + """.trimMargin(), ) } @@ -158,7 +158,7 @@ class TypeVariableNameTest { """ |public class Taco<out E : kotlin.Number> | - """.trimMargin() + """.trimMargin(), ) } @@ -180,7 +180,7 @@ class TypeVariableNameTest { | println(T::class.members) |} | - """.trimMargin() + """.trimMargin(), ) } @@ -192,7 +192,7 @@ class TypeVariableNameTest { """ |public class Taco<E : kotlin.Any> | - """.trimMargin() + """.trimMargin(), ) } @@ -204,7 +204,7 @@ class TypeVariableNameTest { """ |public class Taco<E> | - """.trimMargin() + """.trimMargin(), ) } @@ -218,7 +218,7 @@ class TypeVariableNameTest { """ |public class Taco<E> | - """.trimMargin() + """.trimMargin(), ) } @@ -232,7 +232,7 @@ class TypeVariableNameTest { """ |public class Taco<E> | - """.trimMargin() + """.trimMargin(), ) } @@ -246,7 +246,7 @@ class TypeVariableNameTest { """ |public class Taco<T> | - """.trimMargin() + """.trimMargin(), ) } diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/UtilTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/UtilTest.kt index 09ad8f0c..de3650b6 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/UtilTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/UtilTest.kt @@ -111,9 +111,9 @@ class UtilTest { append("%N(100)") arg += "aaa bbb" }.toString(), - *arg.toTypedArray() + *arg.toTypedArray(), ) - }.build() + }.build(), ) .build() .toString() diff --git a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ValueTypeSpecTest.kt b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ValueTypeSpecTest.kt index 08f1c2ee..e6efa3fa 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ValueTypeSpecTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/ValueTypeSpecTest.kt @@ -31,7 +31,7 @@ class ValueTypeSpecTest(private val useValue: Boolean) { fun data(): Collection<Array<Any>> { return listOf( arrayOf(true), - arrayOf(false) + arrayOf(false), ) } } @@ -51,12 +51,12 @@ class ValueTypeSpecTest(private val useValue: Boolean) { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("avacado", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("avacado", String::class) .initializer("avacado") - .build() + .build(), ) .build() @@ -66,7 +66,7 @@ class ValueTypeSpecTest(private val useValue: Boolean) { | public val avacado: kotlin.String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -75,12 +75,12 @@ class ValueTypeSpecTest(private val useValue: Boolean) { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("avacado", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("avacado", String::class) .initializer("avacado") - .build() + .build(), ) .addInitializerBlock(CodeBlock.EMPTY) .build() @@ -94,7 +94,7 @@ class ValueTypeSpecTest(private val useValue: Boolean) { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -106,12 +106,12 @@ class ValueTypeSpecTest(private val useValue: Boolean) { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("avocado", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("avocado", String::class) .initializer("avocado") - .build() + .build(), ) .superclass(InlineSuperClass::class) .build() @@ -125,12 +125,12 @@ class ValueTypeSpecTest(private val useValue: Boolean) { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("avocado", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("avocado", String::class) .initializer("avocado") - .build() + .build(), ) .addSuperinterface(InlineSuperInterface::class) .build() @@ -141,7 +141,7 @@ class ValueTypeSpecTest(private val useValue: Boolean) { | public val avocado: kotlin.String, |) : com.squareup.kotlinpoet.ValueTypeSpecTest.InlineSuperInterface | - """.trimMargin() + """.trimMargin(), ) } @@ -151,7 +151,7 @@ class ValueTypeSpecTest(private val useValue: Boolean) { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("avocado", String::class) - .build() + .build(), ) .addProperty("garlic", String::class) .build() @@ -164,7 +164,7 @@ class ValueTypeSpecTest(private val useValue: Boolean) { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("avocado", String::class) - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo("value/inline classes must have at least 1 property") @@ -176,13 +176,13 @@ class ValueTypeSpecTest(private val useValue: Boolean) { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("avocado", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("avocado", String::class) .initializer("avocado") .mutable() - .build() + .build(), ) .build() }.hasMessageThat().isEqualTo("value/inline classes must have a single read-only (val) property parameter.") @@ -195,12 +195,12 @@ class ValueTypeSpecTest(private val useValue: Boolean) { FunSpec.constructorBuilder() .addParameter("avocado", String::class) .addModifiers(PRIVATE) - .build() + .build(), ) .addProperty( PropertySpec.builder("avocado", String::class) .initializer("avocado") - .build() + .build(), ) .build() @@ -210,7 +210,7 @@ class ValueTypeSpecTest(private val useValue: Boolean) { | public val avocado: kotlin.String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -220,24 +220,24 @@ class ValueTypeSpecTest(private val useValue: Boolean) { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("x", Int::class) - .build() + .build(), ) .addEnumConstant( "A", TypeSpec.anonymousClassBuilder() .addSuperclassConstructorParameter("%L", 1) - .build() + .build(), ) .addEnumConstant( "B", TypeSpec.anonymousClassBuilder() .addSuperclassConstructorParameter("%L", 2) - .build() + .build(), ) .addProperty( PropertySpec.builder("x", Int::class) .initializer("x") - .build() + .build(), ) .build() assertThat(guacamole.toString()).isEqualTo( @@ -250,7 +250,7 @@ class ValueTypeSpecTest(private val useValue: Boolean) { | ; |} | - """.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 e886e480..f0b68a10 100644 --- a/kotlinpoet/src/test/java/com/squareup/kotlinpoet/jvm/JvmAnnotationsTest.kt +++ b/kotlinpoet/src/test/java/com/squareup/kotlinpoet/jvm/JvmAnnotationsTest.kt @@ -41,9 +41,9 @@ class JvmAnnotationsTest { PropertySpec.builder("foo", String::class) .jvmField() .initializer("%S", "foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -58,7 +58,7 @@ class JvmAnnotationsTest { | public val foo: String = "foo" |} | - """.trimMargin() + """.trimMargin(), ) } @@ -69,15 +69,15 @@ class JvmAnnotationsTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("foo", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("foo", String::class) .jvmField() .initializer("foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -92,7 +92,7 @@ class JvmAnnotationsTest { | public val foo: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -106,11 +106,11 @@ class JvmAnnotationsTest { PropertySpec.builder("foo", String::class) .jvmStatic() .initializer("%S", "foo") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -127,7 +127,7 @@ class JvmAnnotationsTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -142,11 +142,11 @@ class JvmAnnotationsTest { .jvmStatic() .addStatement("return %S", "foo") .returns(String::class) - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -163,7 +163,7 @@ class JvmAnnotationsTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -179,13 +179,13 @@ class JvmAnnotationsTest { FunSpec.getterBuilder() .jvmStatic() .addStatement("return %S", "foo") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -203,7 +203,7 @@ class JvmAnnotationsTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -220,14 +220,14 @@ class JvmAnnotationsTest { FunSpec.setterBuilder() .jvmStatic() .addParameter("value", String::class) - .build() + .build(), ) .initializer("%S", "foo") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -246,7 +246,7 @@ class JvmAnnotationsTest { | } |} | - """.trimMargin() + """.trimMargin(), ) } @@ -262,7 +262,7 @@ class JvmAnnotationsTest { .addFunction( FunSpec.builder("foo") .throws(IOException::class, IllegalArgumentException::class) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -281,7 +281,7 @@ class JvmAnnotationsTest { |public fun foo(): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -290,7 +290,7 @@ class JvmAnnotationsTest { .addFunction( FunSpec.builder("foo") .throws(ClassName("com.squareup.tacos", "IllegalTacoException")) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -304,7 +304,7 @@ class JvmAnnotationsTest { |public fun foo(): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -316,9 +316,9 @@ class JvmAnnotationsTest { FunSpec.constructorBuilder() .throws(IOException::class) .addParameter("foo", String::class) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -333,7 +333,7 @@ class JvmAnnotationsTest { | foo: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -345,9 +345,9 @@ class JvmAnnotationsTest { FunSpec.getterBuilder() .throws(IOException::class) .addStatement("return %S", "foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -362,7 +362,7 @@ class JvmAnnotationsTest { | @Throws(IOException::class) | get() = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -376,9 +376,9 @@ class JvmAnnotationsTest { .throws(IOException::class) .addParameter("value", String::class) .addStatement("print(%S)", "foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -395,7 +395,7 @@ class JvmAnnotationsTest { | print("foo") | } | - """.trimMargin() + """.trimMargin(), ) } @@ -408,9 +408,9 @@ class JvmAnnotationsTest { .addParameter( ParameterSpec.builder("baz", String::class) .defaultValue("%S", "baz") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -426,7 +426,7 @@ class JvmAnnotationsTest { |public fun foo(bar: Int, baz: String = "baz"): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -441,11 +441,11 @@ class JvmAnnotationsTest { .addParameter( ParameterSpec.builder("baz", String::class) .defaultValue("%S", "baz") - .build() + .build(), ) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -461,7 +461,7 @@ class JvmAnnotationsTest { | baz: String = "baz", |) | - """.trimMargin() + """.trimMargin(), ) } @@ -485,7 +485,7 @@ class JvmAnnotationsTest { .addProperty( PropertySpec.builder("foo", String::class) .initializer("%S", "foo") - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -499,7 +499,7 @@ class JvmAnnotationsTest { | |public val foo: String = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -508,7 +508,7 @@ class JvmAnnotationsTest { .addFunction( FunSpec.builder("foo") .jvmName("getFoo") - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -522,7 +522,7 @@ class JvmAnnotationsTest { |public fun foo(): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -534,9 +534,9 @@ class JvmAnnotationsTest { FunSpec.getterBuilder() .jvmName("foo") .addStatement("return %S", "foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -550,7 +550,7 @@ class JvmAnnotationsTest { | @JvmName("foo") | get() = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -564,9 +564,9 @@ class JvmAnnotationsTest { FunSpec.setterBuilder() .jvmName("foo") .addParameter("value", String::class) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -581,7 +581,7 @@ class JvmAnnotationsTest { | set(`value`) { | } | - """.trimMargin() + """.trimMargin(), ) } @@ -598,7 +598,7 @@ class JvmAnnotationsTest { .addProperty( PropertySpec.builder("foo", String::class) .initializer("%S", "foo") - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -612,7 +612,7 @@ class JvmAnnotationsTest { | |public val foo: String = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -621,7 +621,7 @@ class JvmAnnotationsTest { .addType( TypeSpec.classBuilder("Taco") .jvmSuppressWildcards() - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -633,7 +633,7 @@ class JvmAnnotationsTest { |@JvmSuppressWildcards |public class Taco | - """.trimMargin() + """.trimMargin(), ) } @@ -642,7 +642,7 @@ class JvmAnnotationsTest { .addFunction( FunSpec.builder("foo") .jvmSuppressWildcards(suppress = false) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -656,7 +656,7 @@ class JvmAnnotationsTest { |public fun foo(): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -687,7 +687,7 @@ class JvmAnnotationsTest { PropertySpec.builder("foo", String::class) .jvmSuppressWildcards(suppress = false) .initializer("%S", "foo") - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -700,7 +700,7 @@ class JvmAnnotationsTest { |@JvmSuppressWildcards(suppress = false) |public val foo: String = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -711,9 +711,9 @@ class JvmAnnotationsTest { .addParameter( "a", List::class.asClassName() - .parameterizedBy(Int::class.asTypeName().jvmSuppressWildcards()) + .parameterizedBy(Int::class.asTypeName().jvmSuppressWildcards()), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -728,7 +728,7 @@ class JvmAnnotationsTest { |public fun foo(a: List<@JvmSuppressWildcards Int>): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -739,9 +739,9 @@ class JvmAnnotationsTest { .addParameter( "a", List::class.asClassName() - .parameterizedBy(Int::class.asTypeName().jvmWildcard()) + .parameterizedBy(Int::class.asTypeName().jvmWildcard()), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -756,7 +756,7 @@ class JvmAnnotationsTest { |public fun foo(a: List<@JvmWildcard Int>): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -766,7 +766,7 @@ class JvmAnnotationsTest { FunSpec.builder("foo") .synchronized() .addStatement("return %S", "foo") - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -778,7 +778,7 @@ class JvmAnnotationsTest { |@Synchronized |public fun foo() = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -790,9 +790,9 @@ class JvmAnnotationsTest { FunSpec.getterBuilder() .synchronized() .addStatement("return %S", "foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -806,7 +806,7 @@ class JvmAnnotationsTest { | @Synchronized | get() = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -820,9 +820,9 @@ class JvmAnnotationsTest { FunSpec.setterBuilder() .synchronized() .addParameter("value", String::class) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -837,7 +837,7 @@ class JvmAnnotationsTest { | set(`value`) { | } | - """.trimMargin() + """.trimMargin(), ) } @@ -856,9 +856,9 @@ class JvmAnnotationsTest { PropertySpec.builder("foo", String::class) .transient() .initializer("%S", "foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -873,7 +873,7 @@ class JvmAnnotationsTest { | public val foo: String = "foo" |} | - """.trimMargin() + """.trimMargin(), ) } @@ -884,15 +884,15 @@ class JvmAnnotationsTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("foo", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("foo", String::class) .transient() .initializer("foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -907,7 +907,7 @@ class JvmAnnotationsTest { | public val foo: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -919,9 +919,9 @@ class JvmAnnotationsTest { PropertySpec.builder("foo", String::class) .volatile() .initializer("%S", "foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -936,7 +936,7 @@ class JvmAnnotationsTest { | public val foo: String = "foo" |} | - """.trimMargin() + """.trimMargin(), ) } @@ -947,15 +947,15 @@ class JvmAnnotationsTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("foo", String::class) - .build() + .build(), ) .addProperty( PropertySpec.builder("foo", String::class) .volatile() .initializer("foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -970,7 +970,7 @@ class JvmAnnotationsTest { | public val foo: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -979,7 +979,7 @@ class JvmAnnotationsTest { .addFunction( FunSpec.builder("foo") .strictfp() - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -993,7 +993,7 @@ class JvmAnnotationsTest { |public fun foo(): Unit { |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1005,9 +1005,9 @@ class JvmAnnotationsTest { FunSpec.constructorBuilder() .strictfp() .addParameter("foo", String::class) - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1021,7 +1021,7 @@ class JvmAnnotationsTest { | foo: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -1033,9 +1033,9 @@ class JvmAnnotationsTest { FunSpec.getterBuilder() .strictfp() .addStatement("return %S", "foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1049,7 +1049,7 @@ class JvmAnnotationsTest { | @Strictfp | get() = "foo" | - """.trimMargin() + """.trimMargin(), ) } @@ -1063,9 +1063,9 @@ class JvmAnnotationsTest { .strictfp() .addParameter("value", String::class) .addStatement("print(%S)", "foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1081,7 +1081,7 @@ class JvmAnnotationsTest { | print("foo") | } | - """.trimMargin() + """.trimMargin(), ) } @@ -1093,9 +1093,9 @@ class JvmAnnotationsTest { PropertySpec.builder("foo", String::class) .jvmDefault() .initializer("%S", "foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1110,7 +1110,7 @@ class JvmAnnotationsTest { | public val foo: String = "foo" |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1123,9 +1123,9 @@ class JvmAnnotationsTest { .jvmDefault() .returns(String::class) .addStatement("return %S", "foo") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1140,7 +1140,7 @@ class JvmAnnotationsTest { | public fun foo(): String = "foo" |} | - """.trimMargin() + """.trimMargin(), ) } @@ -1152,14 +1152,14 @@ class JvmAnnotationsTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("value", STRING) - .build() + .build(), ) .addProperty( PropertySpec.builder("value", STRING) .initializer("value") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1174,7 +1174,7 @@ class JvmAnnotationsTest { | public val `value`: String, |) | - """.trimMargin() + """.trimMargin(), ) } @@ -1187,14 +1187,14 @@ class JvmAnnotationsTest { .primaryConstructor( FunSpec.constructorBuilder() .addParameter("value", STRING) - .build() + .build(), ) .addProperty( PropertySpec.builder("value", STRING) .initializer("value") - .build() + .build(), ) - .build() + .build(), ) .build() assertThat(file.toString()).isEqualTo( @@ -1209,7 +1209,7 @@ class JvmAnnotationsTest { | public val `value`: String, |) | - """.trimMargin() + """.trimMargin(), ) } } |