fix: array indent on different index position (#635)

Co-authored-by: Petr Spacek <[email protected]>
redhat-developer · Jan 12, 2022 · 47c840a · 47c840a
1 parent 4a36b9b
commit 47c840a
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 1 deletion.
diff --git a/src/languageservice/services/yamlCompletion.ts b/src/languageservice/services/yamlCompletion.ts
@@ -454,7 +454,7 @@ export class YamlCompletion {
 
                 if (typeof propertySchema === 'object' && !propertySchema.deprecationMessage && !propertySchema['doNotSuggest']) {
                   let identCompensation = '';
-                  if (nodeParent && isSeq(nodeParent) && node.items.length <= 1) {
+                  if (nodeParent && isSeq(nodeParent) && node.items.length <= 1 && !hasOnlyWhitespace) {
                     // because there is a slash '-' to prevent the properties generated to have the correct
                     // indent
                     const sourceText = textBuffer.getText();

diff --git a/test/autoCompletionFix.test.ts b/test/autoCompletionFix.test.ts
@@ -329,4 +329,58 @@ objB:
       })
     );
   });
+  describe('array indent on different index position', () => {
+    const schema = {
+      type: 'object',
+      properties: {
+        objectWithArray: {
+          type: 'array',
+          items: {
+            type: 'object',
+            required: ['item', 'item2'],
+            properties: {
+              item: { type: 'string' },
+              item2: {
+                type: 'object',
+                required: ['prop1', 'prop2'],
+                properties: {
+                  prop1: { type: 'string' },
+                  prop2: { type: 'string' },
+                },
+              },
+            },
+          },
+        },
+      },
+    };
+    it('array indent on the first item', async () => {
+      languageService.addSchema(SCHEMA_ID, schema);
+      const content = 'objectWithArray:\n  - ';
+      const completion = await parseSetup(content, 1, 4);
+
+      expect(completion.items.length).equal(2);
+      expect(completion.items[0]).to.be.deep.equal(
+        createExpectedCompletion('item', 'item: ', 1, 4, 1, 4, 10, 2, {
+          documentation: '',
+        })
+      );
+      expect(completion.items[1]).to.be.deep.equal(
+        createExpectedCompletion('item2', 'item2:\n    prop1: $1\n    prop2: $2', 1, 4, 1, 4, 10, 2, {
+          documentation: '',
+        })
+      );
+    });
+    it('array indent on the second item', async () => {
+      languageService.addSchema(SCHEMA_ID, schema);
+      const content = 'objectWithArray:\n  - item: first line\n    ';
+      const completion = await parseSetup(content, 2, 4);
+
+      expect(completion.items.length).equal(1);
+      expect(completion.items[0]).to.be.deep.equal(
+        createExpectedCompletion('item2', 'item2:\n  prop1: $1\n  prop2: $2', 2, 4, 2, 4, 10, 2, {
+          documentation: '',
+        })
+      );
+    });
+  });
 });