Do not add trailing whitespace to new map keys (#16)

dart-lang · Mar 17, 2022 · 46eb45d · 46eb45d
1 parent bd96cbf
commit 46eb45d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/lib/src/map_mutations.dart b/lib/src/map_mutations.dart
@@ -57,14 +57,7 @@ SourceEdit _addToBlockMap(
   final keyString = yamlEncodeFlowString(wrapAsYamlNode(key));
   final lineEnding = getLineEnding(yaml);
 
-  var valueString = yamlEncodeBlockString(newValue, newIndentation, lineEnding);
-  if (isCollection(newValue) &&
-      !isFlowYamlCollectionNode(newValue) &&
-      !isEmpty(newValue)) {
-    valueString = '$lineEnding$valueString';
-  }
-
-  var formattedValue = ' ' * getMapIndentation(yaml, map) + '$keyString: ';
+  var formattedValue = ' ' * getMapIndentation(yaml, map);
   var offset = map.span.end.offset;
 
   final insertionIndex = getMapInsertionIndex(map, keyString);
@@ -90,7 +83,14 @@ SourceEdit _addToBlockMap(
     }
   }
 
-  formattedValue += valueString + lineEnding;
+  var valueString = yamlEncodeBlockString(newValue, newIndentation, lineEnding);
+  if (isCollection(newValue) &&
+      !isFlowYamlCollectionNode(newValue) &&
+      !isEmpty(newValue)) {
+    formattedValue += '$keyString:' + lineEnding + valueString + lineEnding;
+  } else {
+    formattedValue += '$keyString: ' + valueString + lineEnding;
+  }
 
   return SourceEdit(offset, 0, formattedValue);
 }

diff --git a/test/update_test.dart b/test/update_test.dart
@@ -767,7 +767,7 @@ a:
         expect(doc.toString(), equals('''
 a:
   aa: 1
-  bb: 
+  bb:
     aaa:
       dddd: c
     bbb:
@@ -806,7 +806,7 @@ a:
         expect(doc.toString(), equals('''
 a:
   aa: 1
-  bb: 
+  bb:
     - 0
     - - 1
       - 2
-Original file line number
+Diff line change
@@ Expand Up / @@ -767,7 +767,7 @@ a: @@
             expect(doc.toString(), equals('''
     a:
       aa: 1
-      bb:
+      bb:
         aaa:
           dddd: c
         bbb:
@@ Expand Down Expand Up / @@ -806,7 +806,7 @@ a: @@
             expect(doc.toString(), equals('''
     a:
       aa: 1
-      bb:
+      bb:
         - 0
         - - 1
           - 2
@@ Expand Down @@