arrow-kt#58: clean-up

rcd27 · Jul 30, 2022 · 728ee0b · 728ee0b
1 parent 8c6280a
commit 728ee0b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 70 deletions.
diff --git a/generate-sources/new-plugin-runtime/src/main/java/io/arrowkt/example/MetaLog.kt b/generate-sources/new-plugin-runtime/src/main/java/io/arrowkt/example/MetaLog.kt
@@ -1,3 +1,6 @@
 package io.arrowkt.example
 
+/**
+ * Use this annotation for [io.arrowkt.example.MetaPlugin] plugin to inject logic to function
+ */
 annotation class MetaLog
diff --git a/generate-sources/new-plugin-runtime/src/main/java/io/arrowkt/example/MetaLogger.kt b/generate-sources/new-plugin-runtime/src/main/java/io/arrowkt/example/MetaLogger.kt
@@ -1,7 +1,12 @@
 package io.arrowkt.example
 
+@Suppress("unused")
 object MetaLogger {
 
+    /**
+     * Called by [io.arrowkt.example.MetaPlugin] during IR transformation
+     */
+    @Suppress("unused")
     fun log() {
         println("MetaLogger.log() invoked")
     }

diff --git a/generate-sources/new-plugin/src/main/kotlin/io/arrowkt/example/AddAnnotatedLogging.kt b/generate-sources/new-plugin/src/main/kotlin/io/arrowkt/example/AddAnnotatedLogging.kt
@@ -15,12 +15,10 @@ import org.jetbrains.kotlin.ir.util.hasAnnotation
 import org.jetbrains.kotlin.ir.util.statements
 import org.jetbrains.kotlin.name.FqName
 
-val Meta.addAnnotatedLogging: CliPlugin
+val Meta.addLoggingToAnnotatedFunctions: CliPlugin
     get() = "Add Logging To Annotated Functions" {
         meta(
             irFunction { declaration ->
-
-                // FIXME #58: NoClassDefFound when trying to access via MetaLog::class.qualifiedName
                 return@irFunction if (declaration.hasAnnotation(FqName("io.arrowkt.example.MetaLog"))) {
                     declaration.body = prependLoggingToBody(pluginContext, declaration)
 

diff --git a/generate-sources/new-plugin/src/main/kotlin/io/arrowkt/example/MetaPlugin.kt b/generate-sources/new-plugin/src/main/kotlin/io/arrowkt/example/MetaPlugin.kt
@@ -9,9 +9,6 @@ class MetaPlugin : Meta {
     @ExperimentalContracts
     override fun intercept(ctx: CompilerContext): List<CliPlugin> =
         listOf(
-            /* 58: unquote
-          transformNewSources
-             */
-            addAnnotatedLogging
+            addLoggingToAnnotatedFunctions
         )
 }
diff --git a/generate-sources/new-plugin/src/main/kotlin/io/arrowkt/example/TransformNewSources.kt b/generate-sources/new-plugin/src/main/kotlin/io/arrowkt/example/TransformNewSources.kt
diff --git a/generate-sources/use-plugin/src/main/kotlin/io/arrowkt/example/NewMultipleSource.kt b/generate-sources/use-plugin/src/main/kotlin/io/arrowkt/example/NewMultipleSource.kt
diff --git a/generate-sources/use-plugin/src/test/kotlin/io/arrowkt/example/NewMultipleSourceTests.kt b/generate-sources/use-plugin/src/test/kotlin/io/arrowkt/example/NewMultipleSourceTests.kt