redhat-developer#392 fix indentation for object in array completion

Signed-off-by: Yevhen Vydolob <[email protected]>
evidolob · Feb 24, 2021 · 3bb19b2 · 3bb19b2
1 parent 20fecf5
commit 3bb19b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/languageservice/services/yamlCompletion.ts b/src/languageservice/services/yamlCompletion.ts
@@ -893,10 +893,10 @@ export class YAMLCompletion extends JSONCompletion {
             value = ' $1';
             break;
           case 'object':
-            value = `\n${this.indentation}`;
+            value = `\n${ident}`;
             break;
           case 'array':
-            value = `\n${this.indentation}- `;
+            value = `\n${ident}- `;
             break;
           case 'number':
           case 'integer':

diff --git a/test/autoCompletion.test.ts b/test/autoCompletion.test.ts
@@ -1880,5 +1880,16 @@ describe('Auto Completion Tests', () => {
         assert.equal(result.items[0].label, '- (array item) 1');
       });
     });
+
+    it('Array anyOf two objects completion indentation', async () => {
+      const schema = require(path.join(__dirname, './fixtures/testArrayCompletionSchema.json'));
+      languageService.addSchema(SCHEMA_ID, schema);
+      const content = 'test_array_anyOf_2objects:\n  - obj';
+      const completion = await parseSetup(content, content.length);
+      expect(completion.items.length).is.equal(2);
+      const obj1 = completion.items.find((it) => it.label === 'obj1');
+      expect(obj1).is.not.undefined;
+      expect(obj1.textEdit.newText).equal('obj1:\n    ');
+    });
   });
 });