from 1.9.20-Beta2 up to 1.9.30-dev-3330

arrow-kt · Sep 26, 2023 · d8a31f1 · d8a31f1
1 parent 01d3d0b
commit d8a31f1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/arrow-reflect-annotations/src/main/kotlin/arrow/meta/Meta.kt b/arrow-reflect-annotations/src/main/kotlin/arrow/meta/Meta.kt
@@ -51,7 +51,7 @@ annotation class Meta {
       newElement: FirFunctionCall
     ): FirCall {
       val args = newElement.arguments
-      val argsApplied = args.mapIndexed { n, expr -> "args[$n] as ${+expr.typeRef}" }
+      val argsApplied = args.mapIndexed { n, expr -> "args[$n] as ${+expr.resolvedType}" }
       val name = newElement.toResolvedCallableSymbol()?.callableId?.asSingleFqName()?.asString()
 
       return compile(

diff --git a/arrow-reflect-annotations/src/main/kotlin/arrow/meta/MetaContext.kt b/arrow-reflect-annotations/src/main/kotlin/arrow/meta/MetaContext.kt
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.fir.extensions.MemberGenerationContext
 import org.jetbrains.kotlin.fir.symbols.SymbolInternals
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
+import org.jetbrains.kotlin.fir.types.ConeKotlinType
 import org.jetbrains.kotlin.fir.types.FirTypeRef
 import org.jetbrains.kotlin.fir.types.coneType
 import org.jetbrains.kotlin.fir.types.renderReadableWithFqNames
@@ -128,6 +129,9 @@ abstract class FirMetaContext(
       ?: source?.text?.toString()
       ?: error("$this has no source psi text element")
 
+  operator fun ConeKotlinType.unaryPlus(): String =
+    type.renderReadableWithFqNames().replace("/", ".")
+
   val String.call: FirCall
     get() =
       compile(

diff --git a/arrow-reflect-annotations/src/main/kotlin/arrow/meta/TemplateCompiler.kt b/arrow-reflect-annotations/src/main/kotlin/arrow/meta/TemplateCompiler.kt
@@ -163,24 +163,27 @@ class TemplateCompiler(
   fun convertToIR(metaCheckerContext: FirMetaCheckerContext?, firResult: FirResult, moduleConfiguration: CompilerConfiguration): Fir2IrActualizedResult {
     val diagnosticReporter = DiagnosticReporterFactory.createPendingReporter()
     val fir2IrExtensions = JvmFir2IrExtensions(moduleConfiguration, JvmIrDeserializerImpl(), JvmIrMangler)
-    val linkViaSignatures = moduleConfiguration.getBoolean(JVMConfigurationKeys.LINK_VIA_SIGNATURES)
     val scopeFiles = firResult.scopeDeclarations.filterIsInstance<FirFile>()
     val files = firResult.files + scopeFiles
     val validatedFirResult = with(firResult) {
-      org.jetbrains.kotlin.fir.pipeline.FirResult(listOf(
-        ModuleCompilerAnalyzedOutput(session = session, scopeSession = scopeSession, fir = files)
-      ))
+      org.jetbrains.kotlin.fir.pipeline.FirResult(
+        listOf(
+          ModuleCompilerAnalyzedOutput(session = session, scopeSession = scopeSession, fir = files)
+        )
+      )
     }
 
     val fir2IrConfiguration = Fir2IrConfiguration(
       languageVersionSettings = moduleConfiguration.languageVersionSettings,
       diagnosticReporter = diagnosticReporter,
-      linkViaSignatures = linkViaSignatures,
+      linkViaSignatures = moduleConfiguration.getBoolean(JVMConfigurationKeys.LINK_VIA_SIGNATURES),
       evaluatedConstTracker = moduleConfiguration
         .putIfAbsent(CommonConfigurationKeys.EVALUATED_CONST_TRACKER, EvaluatedConstTracker.create()),
       inlineConstTracker = moduleConfiguration[CommonConfigurationKeys.INLINE_CONST_TRACKER],
-      // TODO: read notes on this flag
-      allowNonCachedDeclarations = false
+      // TODO: read notes on these new flags
+      allowNonCachedDeclarations = false,
+      // TODO: see KT-61514
+      useIrFakeOverrideBuilder = moduleConfiguration.getBoolean(CommonConfigurationKeys.USE_IR_FAKE_OVERRIDE_BUILDER)
     )
 
     val fir2IrResult = validatedFirResult.convertToIrAndActualizeForJvm(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 arrowGradleConfig = "0.11.0"
 classgraph = "4.8.154"
-kotlin = "1.9.20-Beta2"
+kotlin = "1.9.30-dev-3330"
 reflections = "0.10.2"
 
 [libraries]

diff --git a/sandbox/build.gradle.kts b/sandbox/build.gradle.kts
@@ -2,10 +2,10 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-val kotlinVersion = "1.9.20-Beta2"
+val kotlinVersion = "1.9.30-dev-3330"
 
 plugins {
-  id("org.jetbrains.kotlin.jvm") version "1.9.20-Beta2"
+  id("org.jetbrains.kotlin.jvm") version "1.9.30-dev-3330"
   id("io.arrow-kt.reflect") version "0.1.0"
   application
 }

diff --git a/sandbox/gradle/libs.versions.toml b/sandbox/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 arrowGradleConfig = "0.11.0"
 classgraph = "4.8.154"
-kotlin = "1.9.20-Beta2"
+kotlin = "1.9.30-dev-3330"
 reflections = "0.10.2"
 
 [libraries]