don't use block-style-only string literals in flow mode

Kalamatee · Jan 9, 2016 · 8d06176 · 8d06176
1 parent 0fbab05
commit 8d06176
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/lib/js-yaml/dumper.js b/lib/js-yaml/dumper.js
@@ -240,9 +240,12 @@ function writeScalar(state, object, level, iskey) {
     simple = false;
   }
 
-  // can only use > and | if not wrapped in spaces or is not a key.
-  if (spaceWrap) {
-    simple = false;
+  // Can only use > and | if not wrapped in spaces or is not a key.
+  // Also, don't use if in flow mode.
+  if (spaceWrap || (state.flowLevel > -1 && state.flowLevel <= level)) {
+    if (spaceWrap) {
+      simple = false;
+    }
     folded = false;
     literal = false;
   } else {

diff --git a/test/issues/0235.js b/test/issues/0235.js
@@ -0,0 +1,12 @@
+'use strict';
+
+var assert = require('assert');
+var yaml = require('../../');
+
+test('Flow style does not dump with block literals.', function () {
+  assert.strictEqual(yaml.dump({ a: '\n' }, { flowLevel: 0 }), '{a: "\\n"}\n');
+});
+
+test('Ok to dump block-style literals when not yet flowing.', function () {
+  assert.strictEqual(yaml.dump({ a: '\n' }, { flowLevel: 2 }), 'a: |\n\n');
+});