Return exit code 1 when not all errors are fixed (#1868)

- calculate only not fixed errors - return 1 when there are errors
saveourtool · Dec 18, 2023 · b3cd098 · b3cd098
1 parent 3ba0fb0
commit b3cd098
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/diktat-api/src/main/kotlin/com/saveourtool/diktat/api/DiktatProcessorListener.kt b/diktat-api/src/main/kotlin/com/saveourtool/diktat/api/DiktatProcessorListener.kt
@@ -88,7 +88,9 @@ interface DiktatProcessorListener {
                 error: DiktatError,
                 isCorrected: Boolean
             ) {
-                incrementAndGet()
+                if (!isCorrected) {
+                    incrementAndGet()
+                }
             }
         }
     }

diff --git a/diktat-cli/src/main/kotlin/com/saveourtool/diktat/DiktatMain.kt b/diktat-cli/src/main/kotlin/com/saveourtool/diktat/DiktatMain.kt
@@ -14,6 +14,7 @@ import java.nio.file.Path
 import java.nio.file.Paths
 
 import kotlin.io.path.absolutePathString
+import kotlin.system.exitProcess
 
 private val log = KotlinLogging.logger { }
 
@@ -39,12 +40,15 @@ fun main(args: Array<String>) {
     )
 
     val diktatRunner = diktatRunnerFactory(diktatRunnerArguments)
-    when (properties.mode) {
+    val unfixedErrors = when (properties.mode) {
         DiktatMode.CHECK -> diktatRunner.checkAll(diktatRunnerArguments)
         DiktatMode.FIX -> diktatRunner.fixAll(diktatRunnerArguments) { updatedFile ->
             log.warn {
                 "Original and formatted content differ, writing to ${updatedFile.absolutePathString()}..."
             }
         }
     }
+    if (unfixedErrors > 0) {
+        exitProcess(1)
+    }
 }
diff --git a/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatCliTest.kt b/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatCliTest.kt
@@ -78,7 +78,7 @@ class DiktatCliTest {
 
             val diktatCliProcess = processBuilder.start()
             val exitCode = diktatCliProcess.waitFor()
-            softly.assertThat(exitCode).describedAs("The exit code of Diktat CLI").isZero
+            softly.assertThat(exitCode).describedAs("The exit code of Diktat CLI").isOne
 
             softly.assertThat(diktatCliLog).isRegularFile