Kv formatting improvements

Author: StefanH-AT

packages/kv/src/formatter.test.ts

@@ -31,7 +31,7 @@ test("Indent container", () => {
 item2 val2
 
 Test2 {
- item3 val3
+ item3 val3 val4
 }
 }`;
 
@@ -41,7 +41,32 @@ Test2 {
  const root = formatter.indentItem(originalRoot, 0);
  expect(root.getKey().getPosition().getRange().getStart()).toBe(0);
  expect(root.getKey().getPosition().getRange().getEnd()).toBe(4);
+ expect(root.getOpeningBrace()?.getPosition().getRange().getStart()).toBe(6);
+ expect(root.getClosingBrace()?.getPosition().getRange().getStart()).toBe(0);
 
  const item1 = root.getChildren()![0];
  expect(item1.getKey().getPosition().getRange().getStart()).toBe(4);
+ expect(item1.getKey().getPosition().getRange().getEnd()).toBe(9);
+ expect(item1.getValues()![0].getPosition().getRange().getStart()).toBe(10);
+ expect(item1.getValues()![0].getPosition().getRange().getEnd()).toBe(14);
+ 
+ const item2 = root.getChildren()![1];
+ expect(item2.getKey().getPosition().getRange().getStart()).toBe(4);
+ expect(item2.getKey().getPosition().getRange().getEnd()).toBe(9);
+ expect(item2.getValues()![0].getPosition().getRange().getStart()).toBe(10);
+ expect(item2.getValues()![0].getPosition().getRange().getEnd()).toBe(14);
+ 
+ const item3 = root.getChildren()![2];
+ expect(item3.getKey().getPosition().getRange().getStart()).toBe(4);
+ expect(item3.getKey().getPosition().getRange().getEnd()).toBe(9);
+ expect(item3.getOpeningBrace()?.getPosition().getRange().getStart()).toBe(11);
+ expect(item3.getClosingBrace()?.getPosition().getRange().getStart()).toBe(4);
+
+ const item4 = item3.getChildren()![0];
+ expect(item4.getKey().getPosition().getRange().getStart()).toBe(8);
+ expect(item4.getKey().getPosition().getRange().getEnd()).toBe(13);
+ expect(item4.getValues()![0].getPosition().getRange().getStart()).toBe(14);
+ expect(item4.getValues()![0].getPosition().getRange().getEnd()).toBe(18);
+ expect(item4.getValues()![1].getPosition().getRange().getStart()).toBe(19);
+ expect(item4.getValues()![1].getPosition().getRange().getEnd()).toBe(23);
 });

packages/kv/src/formatter.ts

@@ -69,13 +69,9 @@ export function indentItem(item: Item, indentLevel = 0): Item {
 
  if(item.isLeaf()) {
  return indentLeafValues(item, indentedKey, indentLevel);
+ } else {
+ return indentContainer(item, indentedKey, indentLevel);
  }
- 
- indentLevel++;
- const children: Item[] = item.getChildren()!.map(childLiteral => indentItem(childLiteral, indentLevel));
-
- return Item.createContainer(item.getParent(), indentedKey, children, item.getCondition());
- 
 }
 
 function indentLeafValues(item: Item, indentedKey: Literal, indentLevel: number): Item {
@@ -95,6 +91,21 @@ function indentLeafValues(item: Item, indentedKey: Literal, indentLevel: number)
  return Item.createLeaf(item.getParent(), indentedKey, values, item.getCondition());
 }
 
+function indentContainer(item: Item, indentedKey: Literal, indentLevel: number): Item {
+ indentLevel++;
+ const children: Item[] = item.getChildren()!.map(childLiteral => indentItem(childLiteral, indentLevel));
+ 
+ const keyEnd: number = indentedKey.getPosition().getRange().getEnd();
+ const c = Item.createContainer(item.getParent(), indentedKey, children, item.getCondition());
+ c.startPopulatingContainer(new Literal(new Position(indentedKey.getPosition().getLine(), new Range(keyEnd + 1, keyEnd + 2)), "{"));
+
+ const closingBracePos = c.getClosingBrace()!.getPosition();
+ const indentStart = getIndentSpacer(indentLevel);
+ c.endPopulatingContainer(new Literal(new Position(closingBracePos.getLine(), new Range(indentStart, indentStart + 1)), "}"));
+
+ return c;
+}
+
 function indentKey(key: Literal, indentLevel: number): Literal {
  const k = key.copy();
  k.getPosition().getRange().moveTo(getIndentSpacer(indentLevel));