diff options
author | Egor Andreevich <egor@squareup.com> | 2022-07-21 13:55:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-21 13:55:21 -0400 |
commit | fa73840b97028731291d2d93206d7ebf3642ff3d (patch) | |
tree | cd556e0b9da094f13da84080557ebde95c2cc3c1 /interop/kotlinx-metadata/src/main/kotlin/com/squareup | |
parent | 122066669c4aa7b4361eebf6d6c8b39ca719579c (diff) | |
download | kotlinpoet-fa73840b97028731291d2d93206d7ebf3642ff3d.tar.gz |
Pass all contents of editorconfig to ktlint (#1305)
* Pass all contents of editorconfig to ktlint
* Enable trailing comma rules
Diffstat (limited to 'interop/kotlinx-metadata/src/main/kotlin/com/squareup')
6 files changed, 32 insertions, 32 deletions
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 700baede..d1223e71 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 @@ -18,14 +18,14 @@ package com.squareup.kotlinpoet.metadata -import kotlinx.metadata.KmClass -import kotlinx.metadata.jvm.KotlinClassHeader -import kotlinx.metadata.jvm.KotlinClassMetadata import javax.lang.model.element.TypeElement import kotlin.annotation.AnnotationTarget.CLASS import kotlin.annotation.AnnotationTarget.FUNCTION import kotlin.annotation.AnnotationTarget.PROPERTY import kotlin.reflect.KClass +import kotlinx.metadata.KmClass +import kotlinx.metadata.jvm.KotlinClassHeader +import kotlinx.metadata.jvm.KotlinClassMetadata /** * Indicates that a given API is part of the experimental KotlinPoet metadata support. This exists 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 7fb594b6..a1e739b5 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 @@ -40,12 +40,12 @@ import com.squareup.kotlinpoet.joinToCode import com.squareup.kotlinpoet.metadata.KotlinPoetMetadataPreview import com.squareup.kotlinpoet.metadata.isConst import com.squareup.kotlinpoet.metadata.specs.ClassInspector +import java.util.Collections +import java.util.TreeSet import kotlinx.metadata.KmProperty import kotlinx.metadata.isLocal import org.jetbrains.annotations.NotNull import org.jetbrains.annotations.Nullable -import java.util.Collections -import java.util.TreeSet @KotlinPoetMetadataPreview internal object ClassInspectorUtil { 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 3dbcaf2d..9a3a9a28 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 @@ -60,17 +60,6 @@ import com.squareup.kotlinpoet.metadata.specs.KM_PROPERTY_COMPARATOR import com.squareup.kotlinpoet.metadata.specs.MethodData import com.squareup.kotlinpoet.metadata.specs.PropertyData import com.squareup.kotlinpoet.metadata.toKmClass -import kotlinx.metadata.KmClass -import kotlinx.metadata.KmDeclarationContainer -import kotlinx.metadata.KmPackage -import kotlinx.metadata.jvm.JvmFieldSignature -import kotlinx.metadata.jvm.JvmMethodSignature -import kotlinx.metadata.jvm.KotlinClassMetadata -import kotlinx.metadata.jvm.fieldSignature -import kotlinx.metadata.jvm.getterSignature -import kotlinx.metadata.jvm.setterSignature -import kotlinx.metadata.jvm.signature -import kotlinx.metadata.jvm.syntheticMethodForAnnotations import java.util.TreeMap import java.util.concurrent.ConcurrentHashMap import javax.lang.model.element.Element @@ -84,6 +73,17 @@ import javax.lang.model.util.ElementFilter import javax.lang.model.util.Elements import javax.lang.model.util.Types import kotlin.LazyThreadSafetyMode.NONE +import kotlinx.metadata.KmClass +import kotlinx.metadata.KmDeclarationContainer +import kotlinx.metadata.KmPackage +import kotlinx.metadata.jvm.JvmFieldSignature +import kotlinx.metadata.jvm.JvmMethodSignature +import kotlinx.metadata.jvm.KotlinClassMetadata +import kotlinx.metadata.jvm.fieldSignature +import kotlinx.metadata.jvm.getterSignature +import kotlinx.metadata.jvm.setterSignature +import kotlinx.metadata.jvm.signature +import kotlinx.metadata.jvm.syntheticMethodForAnnotations private typealias ElementsModifier = javax.lang.model.element.Modifier 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 5f6edc3d..41717abc 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 @@ -15,8 +15,6 @@ */ package com.squareup.kotlinpoet.metadata.classinspectors -import kotlinx.metadata.jvm.JvmFieldSignature -import kotlinx.metadata.jvm.JvmMethodSignature import javax.lang.model.element.Element import javax.lang.model.element.ExecutableElement import javax.lang.model.element.NestingKind @@ -43,6 +41,8 @@ import javax.lang.model.type.TypeVariable import javax.lang.model.type.WildcardType import javax.lang.model.util.AbstractTypeVisitor6 import javax.lang.model.util.Types +import kotlinx.metadata.jvm.JvmFieldSignature +import kotlinx.metadata.jvm.JvmMethodSignature /* * Adapted from 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 9fe14e95..03c75913 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 @@ -53,6 +53,14 @@ import com.squareup.kotlinpoet.metadata.specs.KM_PROPERTY_COMPARATOR import com.squareup.kotlinpoet.metadata.specs.MethodData import com.squareup.kotlinpoet.metadata.specs.PropertyData import com.squareup.kotlinpoet.metadata.toKmClass +import java.lang.reflect.Constructor +import java.lang.reflect.Field +import java.lang.reflect.Method +import java.lang.reflect.Modifier +import java.lang.reflect.Parameter +import java.util.TreeMap +import java.util.concurrent.ConcurrentHashMap +import kotlin.LazyThreadSafetyMode.NONE import kotlinx.metadata.KmClass import kotlinx.metadata.KmDeclarationContainer import kotlinx.metadata.KmPackage @@ -64,14 +72,6 @@ import kotlinx.metadata.jvm.getterSignature import kotlinx.metadata.jvm.setterSignature import kotlinx.metadata.jvm.signature import kotlinx.metadata.jvm.syntheticMethodForAnnotations -import java.lang.reflect.Constructor -import java.lang.reflect.Field -import java.lang.reflect.Method -import java.lang.reflect.Modifier -import java.lang.reflect.Parameter -import java.util.TreeMap -import java.util.concurrent.ConcurrentHashMap -import kotlin.LazyThreadSafetyMode.NONE @KotlinPoetMetadataPreview public class ReflectiveClassInspector private constructor( 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 d5a710f6..37163e55 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 @@ -111,6 +111,12 @@ import com.squareup.kotlinpoet.metadata.propertyAccessorFlags import com.squareup.kotlinpoet.metadata.specs.JvmMethodModifier.DEFAULT import com.squareup.kotlinpoet.metadata.toKmClass import com.squareup.kotlinpoet.tag +import java.util.Locale +import javax.lang.model.element.Element +import javax.lang.model.element.ElementKind +import javax.lang.model.element.PackageElement +import javax.lang.model.element.TypeElement +import kotlin.reflect.KClass import kotlinx.metadata.Flags import kotlinx.metadata.KmClass import kotlinx.metadata.KmClassifier @@ -126,12 +132,6 @@ import kotlinx.metadata.jvm.getterSignature import kotlinx.metadata.jvm.jvmInternalName import kotlinx.metadata.jvm.setterSignature import kotlinx.metadata.jvm.signature -import java.util.Locale -import javax.lang.model.element.Element -import javax.lang.model.element.ElementKind -import javax.lang.model.element.PackageElement -import javax.lang.model.element.TypeElement -import kotlin.reflect.KClass /** @return a [TypeSpec] ABI representation of this [KClass]. */ @KotlinPoetMetadataPreview |