Improve function reifier

- Improve detection of function types - Add contract to reified functions if possible
kordlib · Sep 16, 2023 · da3aabb · da3aabb
1 parent 04bbadf
commit da3aabb
Show file tree

Hide file tree

Showing 33 changed files with 235 additions and 123 deletions.
diff --git a/kotlinpoet/build.gradle.kts b/kotlinpoet/build.gradle.kts
@@ -14,6 +14,14 @@ dependencies {
     commonTestImplementation(kotlin("test-junit5"))
 }
 
+kotlin {
+    sourceSets {
+        all {
+            languageSettings.optIn("kotlin.contracts.ExperimentalContracts")
+        }
+    }
+}
+
 codeGeneration {
     fromVersionCatalog(libs.kotlinpoet)
     packageName = "dev.kord.codegen.kotlinpoet"

diff --git a/...erationSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/AccessorBuilders.kt b/...erationSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/AccessorBuilders.kt
@@ -1,10 +1,7 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.PropertySpec
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 

diff --git a/...nSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/AnnotationSpecBuilders.kt b/...nSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/AnnotationSpecBuilders.kt
@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.Annotatable
@@ -8,7 +6,6 @@ import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.DelicateKotlinPoetApi
 import com.squareup.kotlinpoet.ParameterizedTypeName
 import javax.lang.model.element.AnnotationMirror
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 import kotlin.reflect.KClass

diff --git a/.../generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/AnnotationSpecBuildersReified.kt b/.../generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/AnnotationSpecBuildersReified.kt
@@ -4,7 +4,11 @@ import com.squareup.kotlinpoet.Annotatable
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.asClassName
 import kotlin.Annotation
+import kotlin.contracts.InvocationKind.EXACTLY_ONCE
+import kotlin.contracts.contract
 
 public inline fun <reified T : Annotation>
-    Annotatable.Builder<*>.addAnnotation(block: AnnotationSpecBuilderScope = {}): AnnotationSpec =
-    addAnnotation(T::class.asClassName(), block)
+    Annotatable.Builder<*>.addAnnotation(block: AnnotationSpecBuilderScope = {}): AnnotationSpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addAnnotation(T::class.asClassName(), block)
+}
diff --git a/...Source/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/AnnotationSpecFactories.kt b/...Source/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/AnnotationSpecFactories.kt
@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.AnnotationSpec
@@ -8,7 +6,6 @@ import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.DelicateKotlinPoetApi
 import com.squareup.kotlinpoet.ParameterizedTypeName
 import javax.lang.model.element.AnnotationMirror
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 import kotlin.reflect.KClass

diff --git a/...generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/AnnotationSpecFactoriesReified.kt b/...generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/AnnotationSpecFactoriesReified.kt
@@ -3,6 +3,11 @@ package dev.kord.codegen.kotlinpoet
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.asClassName
 import kotlin.Annotation
+import kotlin.contracts.InvocationKind.EXACTLY_ONCE
+import kotlin.contracts.contract
 
 public inline fun <reified T : Annotation> AnnotationSpec(block: AnnotationSpecBuilderScope = {}):
-    AnnotationSpec = AnnotationSpec(T::class.asClassName(), block)
+    AnnotationSpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return AnnotationSpec(T::class.asClassName(), block)
+}
diff --git a/...rationSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/CodeBlockBuilders.kt b/...rationSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/CodeBlockBuilders.kt
@@ -1,13 +1,10 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeSpec
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 

diff --git a/...ationSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/CodeBlockFactories.kt b/...ationSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/CodeBlockFactories.kt
@@ -1,9 +1,6 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.CodeBlock
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 

diff --git a/...rationSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/FileSpecFactories.kt b/...rationSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/FileSpecFactories.kt
@@ -1,12 +1,9 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.FileSpec.Companion.`get`
 import com.squareup.kotlinpoet.TypeSpec
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 

diff --git a/...ource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/FileSpecFactoriesReified.kt b/...ource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/FileSpecFactoriesReified.kt
@@ -2,6 +2,10 @@ package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.asClassName
+import kotlin.contracts.InvocationKind.EXACTLY_ONCE
+import kotlin.contracts.contract
 
-public inline fun <reified C> FileSpec(block: FileSpecBuilderScope = {}): FileSpec =
-    FileSpec(C::class.asClassName(), block)
+public inline fun <reified C> FileSpec(block: FileSpecBuilderScope = {}): FileSpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return FileSpec(C::class.asClassName(), block)
+}
diff --git a/...erationSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/FunSpecFactories.kt b/...erationSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/FunSpecFactories.kt
@@ -1,10 +1,7 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.MemberName
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 

diff --git a/...ionSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/FunctionSpecBuilders.kt b/...ionSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/FunctionSpecBuilders.kt
@@ -1,12 +1,9 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.MemberName
 import com.squareup.kotlinpoet.TypeSpec
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 

diff --git a/...onSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/ParameterSpecBuilders.kt b/...onSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/ParameterSpecBuilders.kt
@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.DelicateKotlinPoetApi
@@ -11,7 +9,6 @@ import dev.kord.codegen.kotlinpoet.`delegate`.SubSpecDelegateProvider
 import dev.kord.codegen.kotlinpoet.`delegate`.produceByName
 import java.lang.reflect.Type
 import javax.lang.model.element.VariableElement
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 import kotlin.reflect.KClass

diff --git a/...e/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/ParameterSpecBuildersReified.kt b/...e/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/ParameterSpecBuildersReified.kt
@@ -7,23 +7,35 @@ import com.squareup.kotlinpoet.typeNameOf
 import dev.kord.codegen.kotlinpoet.`delegate`.SubSpecDelegateProvider
 import kotlin.String
 import kotlin.collections.Iterable
+import kotlin.contracts.InvocationKind.EXACTLY_ONCE
+import kotlin.contracts.contract
 
 public inline fun <reified T> FunSpec.Builder.addParameter(
   name: String,
   vararg modifiers: KModifier,
   block: ParameterSpecBuilderScope = {},
-): ParameterSpec = addParameter(name, typeNameOf<T>(), modifiers = modifiers, block)
+): ParameterSpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addParameter(name, typeNameOf<T>(), modifiers = modifiers, block)
+}
 
 public inline fun <reified T> FunSpec.Builder.addParameter(vararg modifiers: KModifier, noinline
-    block: ParameterSpecBuilderScope = {}): SubSpecDelegateProvider<ParameterSpec> =
-    addParameter(typeNameOf<T>(), modifiers = modifiers, block)
+    block: ParameterSpecBuilderScope = {}): SubSpecDelegateProvider<ParameterSpec> {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addParameter(typeNameOf<T>(), modifiers = modifiers, block)
+}
 
 public inline fun <reified T> FunSpec.Builder.addParameter(
   name: String,
   modifiers: Iterable<KModifier>,
   block: ParameterSpecBuilderScope = {},
-): ParameterSpec = addParameter(name, typeNameOf<T>(), modifiers, block)
+): ParameterSpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addParameter(name, typeNameOf<T>(), modifiers, block)
+}
 
 public inline fun <reified T> FunSpec.Builder.addParameter(modifiers: Iterable<KModifier>, noinline
-    block: ParameterSpecBuilderScope = {}): SubSpecDelegateProvider<ParameterSpec> =
-    addParameter(typeNameOf<T>(), modifiers, block)
+    block: ParameterSpecBuilderScope = {}): SubSpecDelegateProvider<ParameterSpec> {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addParameter(typeNameOf<T>(), modifiers, block)
+}
diff --git a/...nSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/ParameterSpecFactories.kt b/...nSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/ParameterSpecFactories.kt
@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.DelicateKotlinPoetApi
@@ -9,7 +7,6 @@ import com.squareup.kotlinpoet.ParameterSpec.Companion.`get`
 import com.squareup.kotlinpoet.TypeName
 import java.lang.reflect.Type
 import javax.lang.model.element.VariableElement
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 import kotlin.reflect.KClass

diff --git a/.../generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/ParameterSpecFactoriesReified.kt b/.../generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/ParameterSpecFactoriesReified.kt
@@ -5,15 +5,23 @@ import com.squareup.kotlinpoet.ParameterSpec
 import com.squareup.kotlinpoet.typeNameOf
 import kotlin.String
 import kotlin.collections.Iterable
+import kotlin.contracts.InvocationKind.EXACTLY_ONCE
+import kotlin.contracts.contract
 
 public inline fun <reified T> ParameterSpec(
   name: String,
   vararg modifiers: KModifier,
   block: ParameterSpecBuilderScope = {},
-): ParameterSpec = ParameterSpec(name, typeNameOf<T>(), modifiers = modifiers, block)
+): ParameterSpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return ParameterSpec(name, typeNameOf<T>(), modifiers = modifiers, block)
+}
 
 public inline fun <reified T> ParameterSpec(
   name: String,
   modifiers: Iterable<KModifier>,
   block: ParameterSpecBuilderScope = {},
-): ParameterSpec = ParameterSpec(name, typeNameOf<T>(), modifiers, block)
+): ParameterSpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return ParameterSpec(name, typeNameOf<T>(), modifiers, block)
+}
diff --git a/...ionSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/PropertySpecBuilders.kt b/...ionSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/PropertySpecBuilders.kt
@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.DelicateKotlinPoetApi
@@ -11,7 +9,6 @@ import com.squareup.kotlinpoet.TypeSpec
 import dev.kord.codegen.kotlinpoet.`delegate`.SubSpecDelegateProvider
 import dev.kord.codegen.kotlinpoet.`delegate`.produceByName
 import java.lang.reflect.Type
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 import kotlin.reflect.KClass

diff --git a/...ce/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/PropertySpecBuildersReified.kt b/...ce/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/PropertySpecBuildersReified.kt
@@ -8,43 +8,65 @@ import com.squareup.kotlinpoet.typeNameOf
 import dev.kord.codegen.kotlinpoet.`delegate`.SubSpecDelegateProvider
 import kotlin.String
 import kotlin.collections.Iterable
+import kotlin.contracts.InvocationKind.EXACTLY_ONCE
+import kotlin.contracts.contract
 
 public inline fun <reified T> TypeSpec.Builder.addProperty(
   name: String,
   vararg modifiers: KModifier,
   block: PropertySpecBuilderScope = {},
-): PropertySpec = addProperty(name, typeNameOf<T>(), modifiers = modifiers, block)
+): PropertySpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addProperty(name, typeNameOf<T>(), modifiers = modifiers, block)
+}
 
 public inline fun <reified T> TypeSpec.Builder.addProperty(vararg modifiers: KModifier, noinline
-    block: PropertySpecBuilderScope = {}): SubSpecDelegateProvider<PropertySpec> =
-    addProperty(typeNameOf<T>(), modifiers = modifiers, block)
+    block: PropertySpecBuilderScope = {}): SubSpecDelegateProvider<PropertySpec> {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addProperty(typeNameOf<T>(), modifiers = modifiers, block)
+}
 
 public inline fun <reified T> TypeSpec.Builder.addProperty(
   name: String,
   modifiers: Iterable<KModifier>,
   block: PropertySpecBuilderScope = {},
-): PropertySpec = addProperty(name, typeNameOf<T>(), modifiers, block)
+): PropertySpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addProperty(name, typeNameOf<T>(), modifiers, block)
+}
 
 public inline fun <reified T> TypeSpec.Builder.addProperty(modifiers: Iterable<KModifier>, noinline
-    block: PropertySpecBuilderScope = {}): SubSpecDelegateProvider<PropertySpec> =
-    addProperty(typeNameOf<T>(), modifiers, block)
+    block: PropertySpecBuilderScope = {}): SubSpecDelegateProvider<PropertySpec> {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addProperty(typeNameOf<T>(), modifiers, block)
+}
 
 public inline fun <reified T> FileSpec.Builder.addProperty(
   name: String,
   vararg modifiers: KModifier,
   block: PropertySpecBuilderScope = {},
-): PropertySpec = addProperty(name, typeNameOf<T>(), modifiers = modifiers, block)
+): PropertySpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addProperty(name, typeNameOf<T>(), modifiers = modifiers, block)
+}
 
 public inline fun <reified T> FileSpec.Builder.addProperty(vararg modifiers: KModifier, noinline
-    block: PropertySpecBuilderScope = {}): SubSpecDelegateProvider<PropertySpec> =
-    addProperty(typeNameOf<T>(), modifiers = modifiers, block)
+    block: PropertySpecBuilderScope = {}): SubSpecDelegateProvider<PropertySpec> {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addProperty(typeNameOf<T>(), modifiers = modifiers, block)
+}
 
 public inline fun <reified T> FileSpec.Builder.addProperty(
   name: String,
   modifiers: Iterable<KModifier>,
   block: PropertySpecBuilderScope = {},
-): PropertySpec = addProperty(name, typeNameOf<T>(), modifiers, block)
+): PropertySpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addProperty(name, typeNameOf<T>(), modifiers, block)
+}
 
 public inline fun <reified T> FileSpec.Builder.addProperty(modifiers: Iterable<KModifier>, noinline
-    block: PropertySpecBuilderScope = {}): SubSpecDelegateProvider<PropertySpec> =
-    addProperty(typeNameOf<T>(), modifiers, block)
+    block: PropertySpecBuilderScope = {}): SubSpecDelegateProvider<PropertySpec> {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return addProperty(typeNameOf<T>(), modifiers, block)
+}
diff --git a/...onSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/PropertySpecFactories.kt b/...onSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/PropertySpecFactories.kt
@@ -1,13 +1,10 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.DelicateKotlinPoetApi
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeName
 import java.lang.reflect.Type
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 import kotlin.reflect.KClass

diff --git a/...e/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/PropertySpecFactoriesReified.kt b/...e/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/PropertySpecFactoriesReified.kt
@@ -5,15 +5,23 @@ import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.typeNameOf
 import kotlin.String
 import kotlin.collections.Iterable
+import kotlin.contracts.InvocationKind.EXACTLY_ONCE
+import kotlin.contracts.contract
 
 public inline fun <reified T> PropertySpec(
   name: String,
   vararg modifiers: KModifier,
   block: PropertySpecBuilderScope = {},
-): PropertySpec = PropertySpec(name, typeNameOf<T>(), modifiers = modifiers, block)
+): PropertySpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return PropertySpec(name, typeNameOf<T>(), modifiers = modifiers, block)
+}
 
 public inline fun <reified T> PropertySpec(
   name: String,
   modifiers: Iterable<KModifier>,
   block: PropertySpecBuilderScope = {},
-): PropertySpec = PropertySpec(name, typeNameOf<T>(), modifiers, block)
+): PropertySpec {
+  contract { callsInPlace(block, EXACTLY_ONCE) }
+  return PropertySpec(name, typeNameOf<T>(), modifiers, block)
+}
diff --git a/...nSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/TypeAliasSpecFactories.kt b/...nSource/generationSourceMain/kotlin/dev/kord/codegen/kotlinpoet/TypeAliasSpecFactories.kt
@@ -1,12 +1,9 @@
-@file:OptIn(ExperimentalContracts::class)
-
 package dev.kord.codegen.kotlinpoet
 
 import com.squareup.kotlinpoet.DelicateKotlinPoetApi
 import com.squareup.kotlinpoet.TypeAliasSpec
 import com.squareup.kotlinpoet.TypeName
 import java.lang.reflect.Type
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind.EXACTLY_ONCE
 import kotlin.contracts.contract
 import kotlin.reflect.KClass