Use logger instead of printing directly to stdout anywhere apart from…

… CLI
Kotlin · Jun 26, 2019 · 692b960 · 692b960
1 parent d5cab71
commit 692b960
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/compiler/src/org/jetbrains/dukat/compiler/lowerings/introduceModels.kt b/compiler/src/org/jetbrains/dukat/compiler/lowerings/introduceModels.kt
@@ -53,13 +53,15 @@ import org.jetbrains.dukat.astModel.TypeModel
 import org.jetbrains.dukat.astModel.TypeParameterModel
 import org.jetbrains.dukat.astModel.TypeValueModel
 import org.jetbrains.dukat.astModel.VariableModel
+import org.jetbrains.dukat.logger.Logging
 import org.jetbrains.dukat.panic.raiseConcern
 import org.jetbrains.dukat.translatorString.translate
 import org.jetbrains.dukat.tsmodel.lowerings.GeneratedInterfaceReferenceDeclaration
 import org.jetbrains.dukat.tsmodel.types.ParameterValueDeclaration
 import org.jetbrains.dukat.tsmodel.types.StringLiteralDeclaration
 import java.io.File
 
+private val logger = Logging.logger("introduceModels")
 
 private enum class MetaDataOptions {
     SKIP_NULLS
@@ -383,7 +385,7 @@ private fun TopLevelEntity.convertToModel(): TopLevelNode? {
                     typeParameters = typeParameters.map { typeParameter -> TypeParameterModel(typeParameter, emptyList()) })
         } else null
         else -> {
-            println("skipping ${this::class.simpleName}")
+            logger.debug("skipping ${this::class.simpleName}")
             null
         }
     }

diff --git a/compiler/src/org/jetbrains/dukat/compiler/lowerings/model/ModelWithOwnerTypeLowering.kt b/compiler/src/org/jetbrains/dukat/compiler/lowerings/model/ModelWithOwnerTypeLowering.kt
@@ -12,8 +12,12 @@ import org.jetbrains.dukat.astModel.ObjectModel
 import org.jetbrains.dukat.astModel.ParameterModel
 import org.jetbrains.dukat.astModel.PropertyModel
 import org.jetbrains.dukat.astModel.VariableModel
+import org.jetbrains.dukat.logger.Logging
 import org.jetbrains.dukat.ownerContext.NodeOwner
 
+
+private val logger = Logging.logger("introduceModels")
+
 interface ModelWithOwnerTypeLowering : ModelWithOwnerLowering {
 
     override fun lowerEnumNode(ownerContext: NodeOwner<EnumNode>): EnumNode {
@@ -42,7 +46,7 @@ interface ModelWithOwnerTypeLowering : ModelWithOwnerLowering {
             is PropertyModel -> lowerPropertyModel(NodeOwner(declaration, ownerContext))
             is ConstructorModel -> lowerConstructorModel(NodeOwner(declaration, ownerContext))
             else -> {
-                println("[WARN] [${this::class.simpleName}] skipping ${declaration}")
+                logger.debug("[${this::class.simpleName}] skipping ${declaration}")
                 declaration
             }
         }

diff --git a/itertools/src/itertools.kt b/itertools/src/itertools.kt
@@ -39,8 +39,4 @@ fun <T> cartesian(vararg lists: List<T>): List<List<T>> {
         }
         else -> lists.drop(2).fold(cartesian(lists[0], lists[1])) { acc, a -> cartesian(acc as List<T>, a) }.map { deepFlatten(it) }
     }
-}
-
-fun main() {
-    println(cartesian(listOf("I"), listOf("J"), listOf("I"), listOf("Q"), listOf("W")))
 }
diff --git a/node-lowering/build.gradle b/node-lowering/build.gradle
@@ -5,6 +5,7 @@ plugins {
 dependencies {
     implementation(project(":ast"))
     implementation(project(":ast-common"))
+    implementation(project(":logging"))
     implementation(project(":ownerContext"))
     implementation(project(":panic"))
     implementation(project(":tsmodel"))

diff --git a/node-lowering/src/org/jetrbains/dukat/nodeLowering/NodeWithOwnerTypeLowering.kt b/node-lowering/src/org/jetrbains/dukat/nodeLowering/NodeWithOwnerTypeLowering.kt
@@ -18,13 +18,15 @@ import org.jetbrains.dukat.ast.model.nodes.VariableNode
 import org.jetbrains.dukat.astCommon.IdentifierEntity
 import org.jetbrains.dukat.astCommon.NameEntity
 import org.jetbrains.dukat.astCommon.QualifierEntity
+import org.jetbrains.dukat.logger.Logging
 import org.jetbrains.dukat.ownerContext.NodeOwner
 import org.jetbrains.dukat.panic.raiseConcern
 import org.jetbrains.dukat.tsmodel.types.IntersectionTypeDeclaration
 import org.jetbrains.dukat.tsmodel.types.ParameterValueDeclaration
 import org.jetbrains.dukat.tsmodel.types.TupleDeclaration
 import org.jetbrains.dukat.tsmodel.types.UnionTypeDeclaration
 
+private val logger = Logging.logger("NodeWithOwnerLowering")
 
 interface NodeWithOwnerTypeLowering : NodeWithOwnerLowering<ParameterValueDeclaration> {
 
@@ -82,7 +84,7 @@ interface NodeWithOwnerTypeLowering : NodeWithOwnerLowering<ParameterValueDeclar
             is PropertyNode -> lowerPropertyNode(owner.wrap(declaration))
             is ConstructorNode -> lowerConstructorNode(owner.wrap(declaration))
             else -> {
-                println("[WARN] [${this::class.simpleName}] skipping ${declaration}")
+                logger.debug("[${this::class.simpleName}] skipping ${declaration}")
                 declaration
             }
         }

diff --git a/node-lowering/src/org/jetrbains/dukat/nodeLowering/TypeLowering.kt b/node-lowering/src/org/jetrbains/dukat/nodeLowering/TypeLowering.kt
@@ -18,9 +18,11 @@ import org.jetbrains.dukat.ast.model.nodes.VariableNode
 import org.jetbrains.dukat.astCommon.IdentifierEntity
 import org.jetbrains.dukat.astCommon.NameEntity
 import org.jetbrains.dukat.astCommon.QualifierEntity
+import org.jetbrains.dukat.logger.Logging
 import org.jetbrains.dukat.panic.raiseConcern
 import org.jetbrains.dukat.tsmodel.types.ParameterValueDeclaration
 
+private val logger = Logging.logger("TypeLowering")
 
 interface TypeLowering : Lowering<ParameterValueDeclaration> {
 
@@ -63,7 +65,7 @@ interface TypeLowering : Lowering<ParameterValueDeclaration> {
             is PropertyNode -> lowerPropertyNode(declaration)
             is ConstructorNode -> lowerConstructorNode(declaration)
             else -> {
-                println("[WARN] [${this::class.simpleName}] skipping ${declaration}")
+                logger.debug("[${this::class.simpleName}] skipping ${declaration}")
                 declaration
             }
         }

diff --git a/tsmodel/build.gradle b/tsmodel/build.gradle
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     implementation(project(":ast-common"))
+    implementation(project(":logging"))
     implementation(project(":ownerContext"))
     implementation(project(":panic"))
 }
diff --git a/tsmodel/src/org/jetbrains/dukat/tsmodel/lowerings/DeclarationTypeLowering.kt b/tsmodel/src/org/jetbrains/dukat/tsmodel/lowerings/DeclarationTypeLowering.kt
@@ -1,6 +1,7 @@
 package org.jetbrains.dukat.tsmodel.lowerings
 
 import org.jetbrains.dukat.astCommon.MemberEntity
+import org.jetbrains.dukat.logger.Logging
 import org.jetbrains.dukat.tsmodel.CallSignatureDeclaration
 import org.jetbrains.dukat.tsmodel.ClassDeclaration
 import org.jetbrains.dukat.tsmodel.ConstructorDeclaration
@@ -21,6 +22,7 @@ import org.jetbrains.dukat.tsmodel.types.TupleDeclaration
 import org.jetbrains.dukat.tsmodel.types.TypeDeclaration
 import org.jetbrains.dukat.tsmodel.types.UnionTypeDeclaration
 
+private val logger = Logging.logger("TypeLowering")
 
 interface DeclarationTypeLowering : DeclarationLowering {
 
@@ -66,7 +68,7 @@ interface DeclarationTypeLowering : DeclarationLowering {
             is CallSignatureDeclaration -> lowerCallSignatureDeclaration(declaration)
             is IndexSignatureDeclaration -> lowerIndexSignatureDeclaration(declaration)
             else -> {
-                println("[WARN] [${this::class.simpleName}] skipping ${declaration}")
+                logger.debug("[${this::class.simpleName}] skipping ${declaration}")
                 declaration
             }
         }