diff --git a/src/compose/resolve-flow-collection.ts b/src/compose/resolve-flow-collection.ts index 785f7bb6..7e59af7a 100644 --- a/src/compose/resolve-flow-collection.ts +++ b/src/compose/resolve-flow-collection.ts @@ -198,6 +198,8 @@ export function resolveFlowCollection( const map = new YAMLMap(ctx.schema) map.flow = true map.items.push(pair) + const endRange = (valueNode ?? keyNode).range + map.range = [keyNode.range[0], endRange[1], endRange[2]] ;(coll as YAMLSeq).items.push(map) } offset = valueNode ? valueNode.range[2] : valueProps.end diff --git a/src/nodes/Node.ts b/src/nodes/Node.ts index d590012c..9ddef5e5 100644 --- a/src/nodes/Node.ts +++ b/src/nodes/Node.ts @@ -41,6 +41,7 @@ export type ParsedNode = | YAMLMap.Parsed | YAMLSeq.Parsed +/** `[start, value-end, node-end]` */ export type Range = [number, number, number] export abstract class NodeBase { diff --git a/tests/doc/parse.ts b/tests/doc/parse.ts index 30a08ae4..a71a1f80 100644 --- a/tests/doc/parse.ts +++ b/tests/doc/parse.ts @@ -392,6 +392,12 @@ describe('maps with no values', () => { expect(doc.range).toEqual([0, 4, 4]) }) + test('pair in flow seq has correct range (#573)', () => { + const doc = YAML.parseDocument('[a:]') + expect(doc.range).toEqual([0, 4, 4]) + expect(doc.get(0).range).toEqual([1, 3, 3]) + }) + test('implicit scalar key after explicit key with no value', () => { const doc = YAML.parseDocument('? - 1\nx:\n') expect(doc.contents.items).toMatchObject([