Reformat code.

touchlab · Apr 17, 2024 · d7b8a07 · d7b8a07
1 parent 7801962
commit d7b8a07
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 26 deletions.
diff --git a/...er/kotlin-plugin-core/src/commonMain/kotlin/co/touchlab/skie/context/CommonSkieContext.kt b/...er/kotlin-plugin-core/src/commonMain/kotlin/co/touchlab/skie/context/CommonSkieContext.kt
@@ -1,9 +1,9 @@
 package co.touchlab.skie.context
 
+import co.touchlab.skie.analytics.performance.SkiePerformanceAnalytics
 import co.touchlab.skie.configuration.RootConfiguration
 import co.touchlab.skie.configuration.SkieConfigurationFlag
 import co.touchlab.skie.configuration.provider.CompilerSkieConfigurationData
-import co.touchlab.skie.analytics.performance.SkiePerformanceAnalytics
 import co.touchlab.skie.plugin.analytics.AnalyticsCollector
 import co.touchlab.skie.util.CompilerShim
 import co.touchlab.skie.util.FrameworkLayout

diff --git a/...in-plugin-core/src/commonMain/kotlin/co/touchlab/skie/phases/apinotes/builder/ApiNotes.kt b/...in-plugin-core/src/commonMain/kotlin/co/touchlab/skie/phases/apinotes/builder/ApiNotes.kt
@@ -4,7 +4,6 @@ import com.charleskorn.kaml.Yaml
 import com.charleskorn.kaml.YamlConfiguration
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.encodeToString
 
 @Serializable
 data class ApiNotes(

diff --git a/...b/skie/phases/features/defaultarguments/RemoveConflictingDefaultArgumentOverloadsPhase.kt b/...b/skie/phases/features/defaultarguments/RemoveConflictingDefaultArgumentOverloadsPhase.kt
@@ -2,13 +2,13 @@ package co.touchlab.skie.phases.features.defaultarguments
 
 import co.touchlab.skie.kir.element.KirFunction
 import co.touchlab.skie.phases.SirPhase
-import co.touchlab.skie.sir.signature.Signature
-import co.touchlab.skie.sir.signature.SirHierarchyCache
 import co.touchlab.skie.sir.element.SirCallableDeclaration
 import co.touchlab.skie.sir.element.SirFunction
 import co.touchlab.skie.sir.element.SirVisibility
 import co.touchlab.skie.sir.element.getEntireOverrideHierarchy
 import co.touchlab.skie.sir.element.isExported
+import co.touchlab.skie.sir.signature.Signature
+import co.touchlab.skie.sir.signature.SirHierarchyCache
 
 object RemoveConflictingDefaultArgumentOverloadsPhase : SirPhase {
 

diff --git a/...re/src/commonMain/kotlin/co/touchlab/skie/phases/features/enums/EnumEntryRenamingPhase.kt b/...re/src/commonMain/kotlin/co/touchlab/skie/phases/features/enums/EnumEntryRenamingPhase.kt
@@ -3,7 +3,6 @@ package co.touchlab.skie.phases.features.enums
 import co.touchlab.skie.configuration.EnumInterop
 import co.touchlab.skie.kir.element.KirClass
 import co.touchlab.skie.kir.element.KirEnumEntry
-import co.touchlab.skie.phases.ScheduledPhase
 import co.touchlab.skie.phases.SirPhase
 import co.touchlab.skie.sir.element.isExported
 import co.touchlab.skie.util.swift.toValidSwiftIdentifier

diff --git a/...-plugin-core/src/commonMain/kotlin/co/touchlab/skie/phases/other/VerifyModuleNamePhase.kt b/...-plugin-core/src/commonMain/kotlin/co/touchlab/skie/phases/other/VerifyModuleNamePhase.kt
@@ -1,7 +1,7 @@
 package co.touchlab.skie.phases.other
 
-import co.touchlab.skie.phases.ClassExportPhase
 import co.touchlab.skie.phases.ClassExportCorePhase
+import co.touchlab.skie.phases.ClassExportPhase
 
 object VerifyModuleNamePhase : ClassExportCorePhase {
 

diff --git a/...core/src/commonMain/kotlin/co/touchlab/skie/phases/other/VerifyNoBitcodeEmbeddingPhase.kt b/...core/src/commonMain/kotlin/co/touchlab/skie/phases/other/VerifyNoBitcodeEmbeddingPhase.kt
@@ -1,8 +1,8 @@
 package co.touchlab.skie.phases.other
 
 import co.touchlab.skie.configuration.SwiftCompilerConfiguration
-import co.touchlab.skie.phases.ClassExportPhase
 import co.touchlab.skie.phases.ClassExportCorePhase
+import co.touchlab.skie.phases.ClassExportPhase
 
 object VerifyNoBitcodeEmbeddingPhase : ClassExportCorePhase {
 

diff --git a/...in/co/touchlab/skie/phases/runtime/ConfigureStableNameTypeAliasesForKotlinRuntimePhase.kt b/...in/co/touchlab/skie/phases/runtime/ConfigureStableNameTypeAliasesForKotlinRuntimePhase.kt
@@ -3,8 +3,8 @@ package co.touchlab.skie.phases.runtime
 import co.touchlab.skie.configuration.ClassInterop
 import co.touchlab.skie.configuration.SkieConfigurationFlag
 import co.touchlab.skie.kir.element.KirClass
-import co.touchlab.skie.phases.SirPhase
 import co.touchlab.skie.kir.type.SupportedFlow
+import co.touchlab.skie.phases.SirPhase
 
 object ConfigureStableNameTypeAliasesForKotlinRuntimePhase : SirPhase {
 

diff --git a/...kotlin/co/touchlab/skie/entrypoint/CreateObjCExportCodeSpecPhaseInterceptor.kgp_1.8.20.kt b/...kotlin/co/touchlab/skie/entrypoint/CreateObjCExportCodeSpecPhaseInterceptor.kgp_1.8.20.kt
@@ -5,8 +5,8 @@ package co.touchlab.skie.entrypoint
 import co.touchlab.skie.compilerinject.compilerplugin.mainSkieContext
 import co.touchlab.skie.compilerinject.interceptor.PhaseInterceptor
 import co.touchlab.skie.kir.descriptor.ObjCExportedInterfaceProvider
-import org.jetbrains.kotlin.backend.konan.driver.phases.PsiToIrContext
 import org.jetbrains.kotlin.backend.konan.driver.phases.CreateObjCExportCodeSpecPhase
+import org.jetbrains.kotlin.backend.konan.driver.phases.PsiToIrContext
 import org.jetbrains.kotlin.backend.konan.objcexport.ObjCExportCodeSpec
 import org.jetbrains.kotlin.backend.konan.objcexport.ObjCExportedInterface
 

diff --git a/...kotlin/co/touchlab/skie/analytics/compiler/common/CommonCompilerConfigurationAnalytics.kt b/...kotlin/co/touchlab/skie/analytics/compiler/common/CommonCompilerConfigurationAnalytics.kt
@@ -3,8 +3,8 @@
 package co.touchlab.skie.analytics.compiler.common
 
 import co.touchlab.skie.configuration.SkieConfigurationFlag
-import co.touchlab.skie.util.toPrettyJson
 import co.touchlab.skie.plugin.analytics.AnalyticsProducer
+import co.touchlab.skie.util.toPrettyJson
 import kotlinx.serialization.Serializable
 import org.jetbrains.kotlin.backend.konan.BinaryOptions
 import org.jetbrains.kotlin.backend.konan.KonanConfig

diff --git a/.../kgp_common/kotlin/co/touchlab/skie/analytics/configuration/SkieConfigurationAnalytics.kt b/.../kgp_common/kotlin/co/touchlab/skie/analytics/configuration/SkieConfigurationAnalytics.kt
@@ -2,9 +2,9 @@ package co.touchlab.skie.analytics.configuration
 
 import co.touchlab.skie.configuration.SkieConfigurationFlag
 import co.touchlab.skie.configuration.provider.CompilerSkieConfigurationData
-import co.touchlab.skie.util.toPrettyJson
 import co.touchlab.skie.plugin.analytics.AnalyticsProducer
 import co.touchlab.skie.util.hash.hashed
+import co.touchlab.skie.util.toPrettyJson
 import kotlinx.serialization.Serializable
 
 @Serializable

diff --git a/.../kgp_common/kotlin/co/touchlab/skie/analytics/environment/CompilerEnvironmentAnalytics.kt b/.../kgp_common/kotlin/co/touchlab/skie/analytics/environment/CompilerEnvironmentAnalytics.kt
@@ -3,8 +3,8 @@
 package co.touchlab.skie.analytics.environment
 
 import co.touchlab.skie.configuration.SkieConfigurationFlag
-import co.touchlab.skie.util.toPrettyJson
 import co.touchlab.skie.plugin.analytics.AnalyticsProducer
+import co.touchlab.skie.util.toPrettyJson
 import kotlinx.serialization.Serializable
 import org.jetbrains.kotlin.backend.konan.KonanConfig
 import org.jetbrains.kotlin.konan.target.Xcode

diff --git a/...otlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/analytics/modules/ModulesAnalytics.kt b/...otlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/analytics/modules/ModulesAnalytics.kt
@@ -3,9 +3,9 @@ package co.touchlab.skie.analytics.modules
 import co.touchlab.skie.configuration.SkieConfigurationFlag
 import co.touchlab.skie.kir.descriptor.DescriptorProvider
 import co.touchlab.skie.phases.KotlinIrPhase
-import co.touchlab.skie.util.toPrettyJson
 import co.touchlab.skie.plugin.analytics.AnalyticsProducer
 import co.touchlab.skie.util.hash.hashed
+import co.touchlab.skie.util.toPrettyJson
 import kotlinx.serialization.Serializable
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI

diff --git a/...ugin/src/kgp_common/kotlin/co/touchlab/skie/context/DescriptorModificationPhaseContext.kt b/...ugin/src/kgp_common/kotlin/co/touchlab/skie/context/DescriptorModificationPhaseContext.kt
@@ -1,8 +1,8 @@
 package co.touchlab.skie.context
 
 import co.touchlab.skie.kir.irbuilder.impl.DeclarationBuilderImpl
-import co.touchlab.skie.phases.ForegroundCompilerPhase
 import co.touchlab.skie.phases.DescriptorModificationPhase
+import co.touchlab.skie.phases.ForegroundCompilerPhase
 
 class DescriptorModificationPhaseContext(
     mainSkieContext: MainSkieContext,

diff --git a/...compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/context/InitPhaseContext.kt b/...compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/context/InitPhaseContext.kt
@@ -2,13 +2,13 @@
 
 package co.touchlab.skie.context
 
+import co.touchlab.skie.analytics.performance.SkiePerformanceAnalytics
 import co.touchlab.skie.compilerinject.compilerplugin.SkieConfigurationKeys
 import co.touchlab.skie.configuration.RootConfiguration
 import co.touchlab.skie.configuration.provider.CompilerSkieConfigurationData
 import co.touchlab.skie.configuration.provider.ConfigurationProvider
 import co.touchlab.skie.phases.InitPhase
 import co.touchlab.skie.phases.SkiePhaseScheduler
-import co.touchlab.skie.analytics.performance.SkiePerformanceAnalytics
 import co.touchlab.skie.plugin.analytics.AnalyticsCollector
 import co.touchlab.skie.util.ActualCompilerShim
 import co.touchlab.skie.util.CompilerShim

diff --git a/.../compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/context/KirPhaseContext.kt b/.../compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/context/KirPhaseContext.kt
@@ -7,8 +7,8 @@ import co.touchlab.skie.kir.descriptor.ObjCExportedInterfaceProvider
 import co.touchlab.skie.kir.type.translation.KirCustomTypeMappers
 import co.touchlab.skie.kir.type.translation.KirDeclarationTypeTranslator
 import co.touchlab.skie.kir.type.translation.KirTypeTranslator
-import co.touchlab.skie.phases.KirCompilerPhase
 import co.touchlab.skie.phases.ForegroundCompilerPhase
+import co.touchlab.skie.phases.KirCompilerPhase
 import org.jetbrains.kotlin.backend.konan.objcexport.ObjCExportNamer
 
 class KirPhaseContext(

diff --git a/.../compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/context/MainSkieContext.kt b/.../compiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/context/MainSkieContext.kt
@@ -2,19 +2,19 @@
 
 package co.touchlab.skie.context
 
+import co.touchlab.skie.configuration.SwiftCompilerConfiguration
+import co.touchlab.skie.configuration.SwiftCompilerConfiguration.BuildType
 import co.touchlab.skie.configuration.provider.descriptor.DescriptorConfigurationProvider
 import co.touchlab.skie.kir.KirProvider
 import co.touchlab.skie.kir.descriptor.DescriptorKirProvider
 import co.touchlab.skie.kir.descriptor.MutableDescriptorProvider
 import co.touchlab.skie.kir.descriptor.NativeDescriptorProvider
 import co.touchlab.skie.kir.irbuilder.impl.DeclarationBuilderImpl
 import co.touchlab.skie.phases.BackgroundPhase
+import co.touchlab.skie.phases.ForegroundCompilerPhase
 import co.touchlab.skie.phases.InitPhase
 import co.touchlab.skie.phases.ScheduledPhase
 import co.touchlab.skie.phases.util.StatefulScheduledPhase
-import co.touchlab.skie.configuration.SwiftCompilerConfiguration
-import co.touchlab.skie.configuration.SwiftCompilerConfiguration.BuildType
-import co.touchlab.skie.phases.ForegroundCompilerPhase
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

diff --git a/...mpiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/entrypoint/EntrypointUtils.kt b/...mpiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/entrypoint/EntrypointUtils.kt
@@ -4,9 +4,9 @@ package co.touchlab.skie.entrypoint
 
 import co.touchlab.skie.compilerinject.compilerplugin.mainSkieContext
 import co.touchlab.skie.context.ClassExportPhaseContext
-import co.touchlab.skie.context.KirPhaseContext
 import co.touchlab.skie.context.DescriptorModificationPhaseContext
 import co.touchlab.skie.context.InitPhaseContext
+import co.touchlab.skie.context.KirPhaseContext
 import co.touchlab.skie.context.KotlinIrPhaseContext
 import co.touchlab.skie.context.LinkPhaseContext
 import co.touchlab.skie.context.MainSkieContext

diff --git a/...n-plugin/src/kgp_common/kotlin/co/touchlab/skie/kir/type/translation/KirTypeTranslator.kt b/...n-plugin/src/kgp_common/kotlin/co/touchlab/skie/kir/type/translation/KirTypeTranslator.kt
@@ -5,10 +5,10 @@ import co.touchlab.skie.kir.element.KirClass
 import co.touchlab.skie.kir.type.BlockPointerKirType
 import co.touchlab.skie.kir.type.NonNullReferenceKirType
 import co.touchlab.skie.kir.type.ReferenceKirType
+import co.touchlab.skie.kir.type.SupportedFlow
 import co.touchlab.skie.kir.type.UnresolvedFlowKirType
 import co.touchlab.skie.oir.type.SpecialReferenceOirType
 import co.touchlab.skie.oir.type.VoidOirType
-import co.touchlab.skie.kir.type.SupportedFlow
 import org.jetbrains.kotlin.backend.konan.isExternalObjCClass
 import org.jetbrains.kotlin.backend.konan.isInlined
 import org.jetbrains.kotlin.backend.konan.isKotlinObjCClass

diff --git a/...-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/analytics/KotlinIrAnalyticsPhase.kt b/...-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/analytics/KotlinIrAnalyticsPhase.kt
@@ -1,7 +1,7 @@
 package co.touchlab.skie.phases.analytics
 
-import co.touchlab.skie.phases.KotlinIrPhase
 import co.touchlab.skie.analytics.modules.ModulesAnalytics
+import co.touchlab.skie.phases.KotlinIrPhase
 
 object KotlinIrAnalyticsPhase : KotlinIrPhase {
 

diff --git a/..._common/kotlin/co/touchlab/skie/phases/features/suspend/KotlinSuspendGeneratorDelegate.kt b/..._common/kotlin/co/touchlab/skie/phases/features/suspend/KotlinSuspendGeneratorDelegate.kt
@@ -7,8 +7,8 @@ import co.touchlab.skie.kir.irbuilder.createFunction
 import co.touchlab.skie.kir.irbuilder.util.copyIndexing
 import co.touchlab.skie.kir.irbuilder.util.copyWithoutDefaultValue
 import co.touchlab.skie.kir.irbuilder.util.createValueParameter
-import co.touchlab.skie.phases.KirCompilerPhase
 import co.touchlab.skie.phases.DescriptorModificationPhase
+import co.touchlab.skie.phases.KirCompilerPhase
 import co.touchlab.skie.phases.features.suspend.kotlin.SuspendKotlinBridgeBodyGenerator
 import co.touchlab.skie.phases.util.doInPhase
 import co.touchlab.skie.sir.element.SirVisibility

diff --git a/...otlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/other/ExtraClassExportPhase.kt b/...otlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/other/ExtraClassExportPhase.kt
@@ -6,10 +6,10 @@ import co.touchlab.skie.configuration.provider.descriptor.configuration
 import co.touchlab.skie.kir.descriptor.getAllExposedMembers
 import co.touchlab.skie.kir.irbuilder.createFunction
 import co.touchlab.skie.kir.irbuilder.util.createValueParameter
-import co.touchlab.skie.phases.ClassExportPhase
 import co.touchlab.skie.kir.type.SupportedFlow
 import co.touchlab.skie.kir.type.translation.from
 import co.touchlab.skie.phases.ClassExportCompilerPhase
+import co.touchlab.skie.phases.ClassExportPhase
 import co.touchlab.skie.phases.util.StatefulCompilerDependentKirPhase
 import co.touchlab.skie.phases.util.StatefulSirPhase
 import co.touchlab.skie.phases.util.doInPhase

diff --git a/...lin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/other/VerifyMinOSVersionPhase.kt b/...lin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/other/VerifyMinOSVersionPhase.kt
@@ -1,8 +1,8 @@
 package co.touchlab.skie.phases.other
 
 import co.touchlab.skie.configuration.SkieConfigurationFlag
-import co.touchlab.skie.phases.ClassExportPhase
 import co.touchlab.skie.phases.ClassExportCompilerPhase
+import co.touchlab.skie.phases.ClassExportPhase
 import co.touchlab.skie.util.version.getMinRequiredOsVersionForSwiftAsync
 import co.touchlab.skie.util.version.isLowerVersionThan
 

diff --git a/...mpiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/util/SkiePhaseGroup.kt b/...mpiler/kotlin-plugin/src/kgp_common/kotlin/co/touchlab/skie/phases/util/SkiePhaseGroup.kt
@@ -1,10 +1,10 @@
 package co.touchlab.skie.phases.util
 
+import co.touchlab.skie.analytics.performance.SkiePerformanceAnalytics
 import co.touchlab.skie.configuration.SkieConfigurationFlag
 import co.touchlab.skie.phases.BackgroundPhase
 import co.touchlab.skie.phases.ForegroundPhase
 import co.touchlab.skie.phases.ScheduledPhase
-import co.touchlab.skie.analytics.performance.SkiePerformanceAnalytics
 import kotlinx.coroutines.runBlocking
 import kotlin.reflect.KClass