[Port form snakeyaml-engine] Remove extra indent after blank line com…

…ments. Ports https://bitbucket.org/snakeyaml/snakeyaml-engine/commits/8af4b3befe5ede130782db3386e1b370aded3104
krzema12 · Nov 8, 2024 · a254bee · a254bee
1 parent 373d897
commit a254bee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/commonMain/kotlin/it/krzeminski/snakeyaml/engine/kmp/emitter/Emitter.kt b/src/commonMain/kotlin/it/krzeminski/snakeyaml/engine/kmp/emitter/Emitter.kt
@@ -1130,12 +1130,14 @@ class Emitter(
         stream.write(indicator)
     }
 
-    private fun writeIndent() {
+    private fun writeIndent(): Int {
         val indentToWrite = indent ?: 0
         if (!indention || column > indentToWrite || column == indentToWrite && !whitespace) {
             writeLineBreak()
         }
-        writeWhitespace(indentToWrite - column)
+        val whitespaces = indentToWrite - this.column
+        writeWhitespace(whitespaces)
+        return whitespaces
     }
 
     private fun writeWhitespace(length: Int) {
@@ -1308,6 +1310,7 @@ class Emitter(
         var wroteComment = false
         if (emitComments) {
             var indentColumns = 0
+            var prevColumns = 0
             var firstComment = true
             for (commentLine in commentLines) {
                 if (commentLine.commentType != CommentType.BLANK_LINE) {
@@ -1319,14 +1322,15 @@ class Emitter(
                         )
                         indentColumns = if (column > 0) column - 1 else 0
                     } else {
-                        writeWhitespace(indentColumns)
+                        writeWhitespace(indentColumns - prevColumns)
                         writeIndicator(indicator = "#")
                     }
                     stream.write(commentLine.value)
                     writeLineBreak()
+                    prevColumns = 0
                 } else {
                     writeLineBreak()
-                    writeIndent()
+                    prevColumns = writeIndent()
                 }
                 wroteComment = true
             }

diff --git a/upstream-commit.txt b/upstream-commit.txt
@@ -1 +1 @@
-ef7ebe9c06e963e13f4ab465f300a0dd6f0940c9
+8af4b3befe5ede130782db3386e1b370aded3104
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ef7ebe9c06e963e13f4ab465f300a0dd6f0940c9
		8af4b3befe5ede130782db3386e1b370aded3104