Merge branch 'main' into 807-custom-tags-null-check

redhat-developer · May 28, 2024 · f50b521 · f50b521
2 parents 75bf3ae + e5dcce0
commit f50b521
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/src/languageservice/services/yamlCompletion.ts b/src/languageservice/services/yamlCompletion.ts
@@ -925,7 +925,8 @@ export class YamlCompletion {
             if (propertySchema) {
               this.addSchemaValueCompletions(propertySchema, separatorAfter, collector, types, 'value');
             }
-          } else if (s.schema.additionalProperties) {
+          }
+          if (s.schema.additionalProperties) {
             this.addSchemaValueCompletions(s.schema.additionalProperties, separatorAfter, collector, types, 'value');
           }
         }
@@ -1205,7 +1206,7 @@ export class YamlCompletion {
         insertText = `\${${insertIndex++}:0}`;
         break;
       case 'string':
-        insertText = `\${${insertIndex++}:""}`;
+        insertText = `\${${insertIndex++}}`;
         break;
       case 'object':
         {

diff --git a/test/autoCompletion.test.ts b/test/autoCompletion.test.ts
@@ -1047,7 +1047,7 @@ describe('Auto Completion Tests', () => {
         const completion = parseSetup(content, content.lastIndexOf('Ba') + 2); // pos: 3+2
         completion
           .then(function (result) {
-            assert.strictEqual('fooBar:\n  - ${1:""}', result.items[0].insertText);
+            assert.strictEqual('fooBar:\n  - ${1}', result.items[0].insertText);
           })
           .then(done, done);
       });

diff --git a/test/autoCompletionFix.test.ts b/test/autoCompletionFix.test.ts
@@ -482,7 +482,7 @@ objB:
 
     expect(completion.items.length).equal(1);
     expect(completion.items[0]).to.be.deep.equal(
-      createExpectedCompletion('objectWithArray', 'objectWithArray:\n    - ${1:""}', 1, 4, 1, 4, 10, 2, {
+      createExpectedCompletion('objectWithArray', 'objectWithArray:\n    - ${1}', 1, 4, 1, 4, 10, 2, {
         documentation: '',
       })
     );
@@ -1183,6 +1183,30 @@ objB:
     expect(completion.items[0].insertText).to.be.equal('test1');
   });
 
+  it('should suggest defaultSnippets from additionalProperties', async () => {
+    const schema: JSONSchema = {
+      type: 'object',
+      properties: {
+        id: {
+          type: 'string',
+        },
+      },
+      additionalProperties: {
+        anyOf: [
+          {
+            type: 'string',
+            defaultSnippets: [{ label: 'snippet', body: 'snippetBody' }],
+          },
+        ],
+      },
+    };
+    schemaProvider.addSchema(SCHEMA_ID, schema);
+    const content = 'value: |\n|';
+    const completion = await parseCaret(content);
+
+    expect(completion.items.map((i) => i.insertText)).to.be.deep.equal(['snippetBody']);
+  });
+
   describe('should suggest prop of the object (based on not completed prop name)', () => {
     const schema: JSONSchema = {
       definitions: {