Merge pull request #696 from p-spacek/fix/completion-in-the-middle-of-the-empty-text

fix: completion in the middle of the empty text

Author: msivasubramaniaan

src/languageservice/services/yamlCompletion.ts

@@ -326,6 +326,20 @@ export class YamlCompletion {
 
       let originalNode = node;
       if (node) {
+        // when the value is null but the cursor is between prop name and null value (cursor is not at the end of the line)
+        if (isMap(node) && node.items.length && isPair(node.items[0])) {
+          const pairNode = node.items[0];
+          if (
+            isScalar(pairNode.value) &&
+            isScalar(pairNode.key) &&
+            pairNode.value.value === null && // value is null
+            pairNode.key.range[2] < offset && // cursor is after colon
+            pairNode.value.range[0] > offset // cursor is before null
+          ) {
+            node = pairNode.value;
+            overwriteRange.end.character += pairNode.value.range[2] - offset; // extend range to the end of the null element
+          }
+        }
         // when the array item value is null but the cursor is between '-' and null value (cursor is not at the end of the line)
         if (isSeq(node) && node.items.length && isScalar(node.items[0]) && lineContent.includes('-')) {
           const nullNode = node.items[0];

test/autoCompletionFix.test.ts

@@ -471,6 +471,23 @@ objB:
       expect(completion.items[1].insertText).to.be.equal('obj1:\n  prop2: ${1:value}');
     });
 
+    it('should suggest when cursor is not on the end of the line', async () => {
+      const schema: JSONSchema = {
+        properties: {
+          prop: {
+            const: 'const',
+          },
+        },
+      };
+      languageService.addSchema(SCHEMA_ID, schema);
+      const content = 'prop:   ';
+      const completion = await parseSetup(content, 0, 6);
+
+      expect(completion.items.length).equal(1);
+      expect(completion.items[0].label).to.be.equal('const');
+      expect(completion.items[0].textEdit).to.be.deep.equal({ newText: 'const', range: Range.create(0, 6, 0, content.length) });
+    });
+
     it('should suggest object array when extra space is after cursor', async () => {
       const schema: JSONSchema = {
         properties: {