Updated version, fixed issue with detecting ACF errors.

alchitry · Oct 13, 2023 · 2fa0f68 · 2fa0f68
1 parent 0a22f10
commit 2fa0f68
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
     id("at.stnwtr.gradle-secrets-plugin") version "1.0.1"
 }
 
-val fullVersion = "2.0.0-PREVIEW"
+val fullVersion = "2.0.1-PREVIEW"
 val numOnlyVersion = fullVersion.split('-').first()
 
 group = "com.alchitry"

diff --git a/src/main/kotlin/com/alchitry/labs/Log.kt b/src/main/kotlin/com/alchitry/labs/Log.kt
@@ -87,7 +87,7 @@ object Log {
         println(message, AlchitryColors.current.Error)
         if (throwable != null) {
             throwable.message?.let { println(it, AlchitryColors.current.Error) }
-            throwable.printStackTrace()
+            println(throwable.stackTraceToString(), AlchitryColors.current.Error)
         }
     }
 

diff --git a/src/main/kotlin/com/alchitry/labs/project/Project.kt b/src/main/kotlin/com/alchitry/labs/project/Project.kt
@@ -15,6 +15,7 @@ import com.alchitry.labs.project.files.ConstraintFile
 import com.alchitry.labs.project.files.IPCore
 import com.alchitry.labs.project.files.SourceFile
 import com.alchitry.labs.ui.misc.openFileDialog
+import com.alchitry.labs.ui.theme.AlchitryColors
 import com.alchitry.labs.windows.mainWindow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -69,11 +70,11 @@ data class Project(
         val topModule = context?.top
         if (context == null || topModule == null) {
             Log.printlnError("Failed to build project context!")
-            Log.printlnError(errorManger.getReport())
+            Log.print(errorManger.getReport(), AlchitryColors.current.Error)
             return false
         }
 
-        Log.println(errorManger.getReport())
+        Log.print(errorManger.getReport())
 
         val sourceFiles = try {
             context.convertToVerilog()
@@ -123,9 +124,8 @@ data class Project(
             return false
         }
 
-        if (constraints.values.contains(null)) {
-            Log.printlnError("Failed to convert all constraint files!")
-            Log.printlnError(constraintErrorManager.getReport())
+        if (!constraintErrorManager.hasNoMessages) {
+            Log.print(constraintErrorManager.getReport(), AlchitryColors.current.Error)
             return false
         }