Allow same-column end for flow collections (Fixes #113, fixes #114, ref #108)

Author: eemeli

src/cst/FlowCollection.js

@@ -47,11 +47,16 @@ export default class FlowCollection extends Node {
               this.items.push(blankLine)
             }
             offset = Node.endOfIndent(src, lineStart)
-            if (offset - lineStart <= indent)
-              this.error = new YAMLSemanticError(
-                this,
-                'Insufficient indentation in flow collection'
-              )
+            if (offset <= lineStart + indent) {
+              char = src[offset]
+              if (
+                offset < lineStart + indent ||
+                (char !== ']' && char !== '}')
+              ) {
+                const msg = 'Insufficient indentation in flow collection'
+                this.error = new YAMLSemanticError(this, msg)
+              }
+            }
           }
           break
         case ',':

tests/cst/corner-cases.js

@@ -1,3 +1,4 @@
+import { source } from 'common-tags'
 import parse from '../../src/cst/parse'
 
 describe('folded block with chomp: keep', () => {
@@ -230,3 +231,75 @@ test('blank line after less-indented comment (eemeli/yaml#91)', () => {
     { type: 'MAP' }
   ])
 })
+
+describe('flow collection as same-line mapping key value', () => {
+  test('eemeli/yaml#113', () => {
+    const src = source`
+      ---
+      foo:
+        bar:
+          enum: [
+            "abc",
+            "cde"
+          ]
+    `
+    const doc = parse(src)
+    const barValue = doc[0].contents[0].items[1].node.items[1].node
+    expect(barValue.items[1].node).toMatchObject({
+      error: null,
+      items: [
+        { char: '[' },
+        { type: 'QUOTE_DOUBLE' },
+        { char: ',' },
+        { type: 'QUOTE_DOUBLE' },
+        { char: ']' }
+      ],
+      type: 'FLOW_SEQ'
+    })
+  })
+
+  test('eemeli/yaml#114', () => {
+    const src = source`
+      foo: {
+        bar: boom
+      }
+    `
+    const doc = parse(src)
+    const flowCollection = doc[0].contents[0].items[1].node
+    expect(flowCollection).toMatchObject({
+      error: null,
+      items: [
+        { char: '{' },
+        { type: 'PLAIN' },
+        { char: ':' },
+        { type: 'PLAIN' },
+        { char: '}' }
+      ],
+      type: 'FLOW_MAP'
+    })
+  })
+
+  test('Fails on insufficient indent', () => {
+    const src = source`
+      foo: {
+        bar: boom
+      }
+    `
+    const doc = parse(' ' + src)
+    const flowCollection = doc[0].contents[0].items[1].node
+    expect(flowCollection).toMatchObject({
+      error: {
+        message: 'Insufficient indentation in flow collection',
+        name: 'YAMLSemanticError'
+      },
+      items: [
+        { char: '{' },
+        { type: 'PLAIN' },
+        { char: ':' },
+        { type: 'PLAIN' },
+        { char: '}' }
+      ],
+      type: 'FLOW_MAP'
+    })
+  })
+})