formatting

Strumenta · Jul 5, 2023 · c8852f6 · c8852f6
1 parent 01263ca
commit c8852f6
Show file tree

Hide file tree

Showing 13 changed files with 117 additions and 93 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,6 @@ allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
-        maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/"}
     }
 }
 

diff --git a/core/src/main/kotlin/com/strumenta/kolasu/serialization/JsonGenerator.kt b/core/src/main/kotlin/com/strumenta/kolasu/serialization/JsonGenerator.kt
@@ -38,8 +38,9 @@ fun jsonArray(values: Iterator<Any?>): JsonArray {
 }
 
 private fun Any?.toJsonElement(): JsonElement {
-    if (this == null)
+    if (this == null) {
         return JsonNull.INSTANCE
+    }
 
     return when (this) {
         is JsonElement -> this

diff --git a/lionweb-gen-gradle/src/main/kotlin/com/strumenta/kolasu/lionwebgen/LionWebGradlePlugin.kt b/lionweb-gen-gradle/src/main/kotlin/com/strumenta/kolasu/lionwebgen/LionWebGradlePlugin.kt
@@ -32,7 +32,7 @@ class LionWebGradlePlugin : Plugin<Project> {
         createGenLanguagesTask(project, configuration)
     }
 
-    private fun createGenASTClassesTask(project: Project, configuration: LionWebGradleExtension) : Task {
+    private fun createGenASTClassesTask(project: Project, configuration: LionWebGradleExtension): Task {
         return project.tasks.create(genASTClasses) {
             it.group = tasksGroup
             it.doLast {
@@ -45,9 +45,14 @@ class LionWebGradlePlugin : Plugin<Project> {
                             val jsonser = JsonSerialization.getStandardSerialization()
                             jsonser.nodeResolver.addTree(StarLasuLWLanguage)
                             val language = jsonser.unserializeToNodes(FileInputStream(languageFile)).first() as Language
-                            val existingKotlinClasses = KotlinCodeProcessor().classesDeclaredInDir(project.file("src/main/kotlin"))
-
-                            val ktFiles = ASTGenerator(configuration.importPackageNames.get()[language.name] ?: language.name, language)
+                            val existingKotlinClasses = KotlinCodeProcessor().classesDeclaredInDir(
+                                project.file("src/main/kotlin")
+                            )
+
+                            val ktFiles = ASTGenerator(
+                                configuration.importPackageNames.get()[language.name] ?: language.name,
+                                language
+                            )
                                 .generateClasses(existingKotlinClasses)
                             ktFiles.forEach { ktFile ->
                                 val file = File(configuration.outdir.get(), ktFile.path)
@@ -57,14 +62,13 @@ class LionWebGradlePlugin : Plugin<Project> {
                             }
                         }
                     }
-
                 }
                 println("LIonWeb AST Classes generation task - completed")
             }
         }
     }
 
-    private fun createGenLanguagesTask(project: Project, configuration: LionWebGradleExtension) : Task {
+    private fun createGenLanguagesTask(project: Project, configuration: LionWebGradleExtension): Task {
         return project.tasks.create(genLanguages) { it ->
             it.group = tasksGroup
             it.dependsOn("compileKotlin")
@@ -73,7 +77,7 @@ class LionWebGradlePlugin : Plugin<Project> {
                 configuration.exportPackages.get().forEach { packageName ->
                     project.javaexec { jes ->
                         jes.classpath = project.sourceSets.getByName("main").runtimeClasspath
-                        jes.mainClass.set("${packageName}.LanguageKt")
+                        jes.mainClass.set("$packageName.LanguageKt")
                         jes.args = mutableListOf(lionwebLanguageFile(project, packageName).absolutePath)
                     }
                 }
@@ -84,7 +88,7 @@ class LionWebGradlePlugin : Plugin<Project> {
     /**
      * Prepare the plugin configuration setting in place default values.
      */
-    private fun prepareConfiguration(project: Project) : LionWebGradleExtension {
+    private fun prepareConfiguration(project: Project): LionWebGradleExtension {
         val configuration = project.extensions.create("lionweb", LionWebGradleExtension::class.java)
         configuration.outdir.convention(File(project.buildDir, "lionweb-gen"))
         val srcMainLionweb = project.file("src${File.separator}main${File.separator}lionweb")
@@ -98,7 +102,7 @@ class LionWebGradlePlugin : Plugin<Project> {
         return configuration
     }
 
-    private fun lionwebLanguageFile(project: Project, packageName: String) : File {
+    private fun lionwebLanguageFile(project: Project, packageName: String): File {
         return File(project.buildDir, "lionwebgen${File.separator}$packageName.json")
     }
 
@@ -133,16 +137,20 @@ class LionWebGradlePlugin : Plugin<Project> {
         }
 
         project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).forEach {
-            it.source(File(project.buildDir, "lionweb-gen"),
-                File(project.rootDir, "src${File.separator}main${File.separator}kotlin"))
+            it.source(
+                File(project.buildDir, "lionweb-gen"),
+                File(project.rootDir, "src${File.separator}main${File.separator}kotlin")
+            )
             it.dependsOn(genASTClasses)
         }
     }
 
     private fun addDependencies(project: Project) {
         fun addKolasuModule(moduleName: String) {
-            project.dependencies.add("implementation",
-                "com.strumenta.kolasu:kolasu-$moduleName:${project.kolasuVersion}")
+            project.dependencies.add(
+                "implementation",
+                "com.strumenta.kolasu:kolasu-$moduleName:${project.kolasuVersion}"
+            )
         }
 
         addKolasuModule("core")
@@ -153,7 +161,9 @@ class LionWebGradlePlugin : Plugin<Project> {
         project.dependencies.add("implementation", "com.github.ajalt.clikt:clikt:3.5.0")
 
         // We need to use this one to avoid an issue with Gson
-        project.dependencies.add("implementation", "io.lionweb.lioncore-java:lioncore-java-core-fat:${project.lionwebVersion}")
+        project.dependencies.add(
+            "implementation",
+            "io.lionweb.lioncore-java:lioncore-java-core-fat:${project.lionwebVersion}"
+        )
     }
-
-}
+}
diff --git a/.../com/strumenta/kolasu/lionwebgen/utils.kt → .../com/strumenta/kolasu/lionwebgen/Utils.kt b/.../com/strumenta/kolasu/lionwebgen/utils.kt → .../com/strumenta/kolasu/lionwebgen/Utils.kt
@@ -24,4 +24,4 @@ val Project.kolasuVersion
     get() = project.propertyValue("kolasuVersion", BuildConfig.PLUGIN_VERSION)
 
 val Project.lionwebVersion
-    get() = project.propertyValue("lionwebVersion", "0.0.18")
+    get() = project.propertyValue("lionwebVersion", "0.0.18")
diff --git a/lionweb-gen-gradle/src/test/kotlin/LionWebGradlePluginTest.kt b/lionweb-gen-gradle/src/test/kotlin/LionWebGradlePluginTest.kt
@@ -4,8 +4,6 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import java.io.File
 import java.nio.file.Files
-import kotlin.test.Ignore
-
 
 class LionWebGradlePluginTest {
     var projectDir: File? = null
@@ -60,5 +58,4 @@ class LionWebGradlePluginTest {
         runner.withProjectDir(projectDir)
         val result = runner.build()
     }
-
-}
+}
diff --git a/lionweb-gen/build.gradle b/lionweb-gen/build.gradle
@@ -41,6 +41,9 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlin_version")
 }
 
+def isReleaseVersion = !(version as String).endsWith("SNAPSHOT")
+
+
 publishing {
 
     repositories {
@@ -60,7 +63,7 @@ publishing {
             from components.java
             artifactId "kolasu-" + project.name
             artifact sourcesJar
-            artifact javadocJar
+            artifact kdocJar
             suppressPomMetadataWarningsFor('cliApiElements')
             suppressPomMetadataWarningsFor('cliRuntimeElements')
             pom {

diff --git a/lionweb-gen/src/main/kotlin/com/strumenta/kolasu/lionweb/KotlinCodeProcessor.kt b/lionweb-gen/src/main/kotlin/com/strumenta/kolasu/lionweb/KotlinCodeProcessor.kt
@@ -57,7 +57,9 @@ class KotlinCodeProcessor {
         val disposable = Disposer.newDisposable()
         try {
             val env = KotlinCoreEnvironment.createForProduction(
-                disposable, CompilerConfiguration(), EnvironmentConfigFiles.JVM_CONFIG_FILES
+                disposable,
+                CompilerConfiguration(),
+                EnvironmentConfigFiles.JVM_CONFIG_FILES
             )
             val file = LightVirtualFile("temp.kt", KotlinFileType.INSTANCE, code)
             return PsiManager.getInstance(env.project).findFile(file) as KtFile

diff --git a/lionweb-gen/src/test/kotlin/RecognizeExistingASTClassesTest.kt b/lionweb-gen/src/test/kotlin/RecognizeExistingASTClassesTest.kt
@@ -52,7 +52,8 @@ public data class Property(
         val existingClasses = KotlinCodeProcessor().classesDeclaredInFile(code)
         assertEquals(
             setOf(
-                "com.strumenta.props.PropertiesFile", "com.strumenta.props.SomeOtherClass",
+                "com.strumenta.props.PropertiesFile",
+                "com.strumenta.props.SomeOtherClass",
                 "com.strumenta.props.Property"
             ),
             existingClasses

diff --git a/lionweb-ksp/build.gradle b/lionweb-ksp/build.gradle
@@ -11,6 +11,8 @@ dependencies {
     implementation(project(":core"))
 }
 
+def isReleaseVersion = !(version as String).endsWith("SNAPSHOT")
+
 publishing {
 
     repositories {

diff --git a/lionweb-ksp/src/main/kotlin/com/strumenta/kolasu/ksp/KolasuSymbolProcessor.kt b/lionweb-ksp/src/main/kotlin/com/strumenta/kolasu/ksp/KolasuSymbolProcessor.kt
@@ -15,20 +15,21 @@ import java.lang.IllegalStateException
 
 class KolasuSymbolProcessor(val environment: SymbolProcessorEnvironment) : SymbolProcessor {
 
-    var generated : Boolean = false
+    var generated: Boolean = false
 
     class LanguageDef(val packageName: String) {
         val classes = mutableListOf<KSClassDeclaration>()
 
-        fun dependencies() : Dependencies {
+        fun dependencies(): Dependencies {
             val usedFiles = this.classes.mapNotNull { it.containingFile }.toSet().toTypedArray()
             val dependencies = Dependencies(true, *usedFiles)
             return dependencies
         }
 
         fun write(os: OutputStream) {
             val buf = PrintWriter(os)
-            buf.println("""
+            buf.println(
+                """
                     // ${classes.first().containingFile?.filePath}
                     // ${classes.first().containingFile?.origin}
                     package $packageName
@@ -50,7 +51,8 @@ class KolasuSymbolProcessor(val environment: SymbolProcessorEnvironment) : Symbo
                     fun main(args: Array<String>) {
                         LanguageGeneratorCommand(lwLanguage).main(args)
                     }                    
-            """.trimIndent())
+                """.trimIndent()
+            )
             buf.flush()
         }
     }
@@ -61,7 +63,6 @@ class KolasuSymbolProcessor(val environment: SymbolProcessorEnvironment) : Symbo
         }
         val exportPackagesStr = kspFile.readText().trim().split("=")[1]
 
-
         if (exportPackagesStr.isNullOrBlank()) {
             // No packages to export, we are done here
             return emptyList()
@@ -73,7 +74,9 @@ class KolasuSymbolProcessor(val environment: SymbolProcessorEnvironment) : Symbo
             val packageName = ksFile.packageName.asString()
             ksFile.declarations.forEach { ksDeclaration ->
                 if (ksDeclaration is KSClassDeclaration) {
-                    val isNodeDecl = ksDeclaration.getAllSuperTypes().any { it.declaration.qualifiedName?.asString() == Node::class.qualifiedName}
+                    val isNodeDecl = ksDeclaration.getAllSuperTypes().any {
+                        it.declaration.qualifiedName?.asString() == Node::class.qualifiedName
+                    }
                     if (isNodeDecl) {
                         languagesByPackage.computeIfAbsent(packageName) {
                             LanguageDef(packageName)
@@ -85,12 +88,18 @@ class KolasuSymbolProcessor(val environment: SymbolProcessorEnvironment) : Symbo
 
         if (!generated) {
             languagesByPackage.values.forEach { languageDef ->
-                languageDef.write(environment.codeGenerator.createNewFile(languageDef.dependencies(),
-                    languageDef.packageName, "Language", "kt"))
+                languageDef.write(
+                    environment.codeGenerator.createNewFile(
+                        languageDef.dependencies(),
+                        languageDef.packageName,
+                        "Language",
+                        "kt"
+                    )
+                )
             }
 
             generated = true
         }
         return emptyList()
     }
-}
+}
diff --git a/lionweb-ksp/src/main/kotlin/com/strumenta/kolasu/ksp/KolasuSymbolProcessorProvider.kt b/lionweb-ksp/src/main/kotlin/com/strumenta/kolasu/ksp/KolasuSymbolProcessorProvider.kt
@@ -8,4 +8,4 @@ class KolasuSymbolProcessorProvider : SymbolProcessorProvider {
     override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor {
         return KolasuSymbolProcessor(environment)
     }
-}
+}