Refactor for if/then completion

Author: diyaayay

language-server/src/features/if-then-completion.js

@@ -8,61 +8,63 @@ export default {
   },
 
   onInitialized() {
-    subscribe("completions", async (_message, { document, offset, completions }) => {
-      const text = document.getText();
-      const startOfLine = text.lastIndexOf("\n", offset - 1) + 1;
-      const textBeforePosition = text.slice(startOfLine, offset);
-      if (textBeforePosition.trim().endsWith("\"if\":")) {
-        completions.push(...ifThenPatternCompletion());
+    subscribe("completions", async (_message, { schemaDocument, offset, completions }) => {
+      const currentProperty = schemaDocument.findNodeAtOffset(offset);
+      if (currentProperty && currentProperty.pointer.endsWith("/if")) {
+        completions.push(...ifThenPatternCompletion);
       }
+
+      // const text = document.getText();
+      // const startOfLine = text.lastIndexOf("\n", offset - 1) + 1;
+      // const textBeforePosition = text.slice(startOfLine, offset);
+      // if (textBeforePosition.trim().endsWith("\"if\":")) {
+      //   completions.push(...ifThenPatternCompletion());
+      // }
     });
   }
 };
 
-function ifThenPatternCompletion() {
-  return [
-    {
-      label: "if/then",
-      kind: CompletionItemKind.Snippet,
-      insertText: `{
-          "type": "object",
-          "properties": {
-            "{varName}": { "const": "{value}" }
-          },
-          "required": ["{varName}"]
-        },
-        
-        "then": {
-        }`,
-      documentation: "Basic if/then pattern with a single condition and corresponding schema."
+const ifThenPatternCompletion = [
+  {
+    label: "if/then",
+    kind: CompletionItemKind.Snippet,
+    insertText: `{
+      "type": "object",
+      "properties": {
+        "{varName}": { "const": "{value}" }
+      },
+      "required": ["{varName}"]
     },
-    {
-      label: "If/then/else",
-      kind: CompletionItemKind.Snippet,
-      insertText: `{
-           "type": "object",
-           "properties": {
-            "{varName}": { "const": "{value}" }
-          },
-          "required": ["{varName}"]
-         },
-         "then": {
-         },
-         "else": {
-         }`,
-      documentation: "Conditional object structure with if/then/else logic"
+    "then": {
+    }`,
+    documentation: "Basic if/then pattern with a single condition and corresponding schema."
+  },
+  {
+    label: "If/then/else",
+    kind: CompletionItemKind.Snippet,
+    insertText: `{
+      "type": "object",
+      "properties": {
+        "{varName}": { "const": "{value}" }
+      },
+      "required": ["{varName}"]
     },
-    {
-      label: "true",
-      kind: CompletionItemKind.Snippet,
-      insertText: `true`,
-      documentation: "if true"
+    "then": {
     },
-    {
-      label: "false",
-      kind: CompletionItemKind.Snippet,
-      insertText: `false`,
-      documentation: "if false"
-    }
-  ];
-}
+    "else": {
+    }`,
+    documentation: "Conditional object structure with if/then/else logic"
+  },
+  {
+    label: "true",
+    kind: CompletionItemKind.Snippet,
+    insertText: `true`,
+    documentation: "if true"
+  },
+  {
+    label: "false",
+    kind: CompletionItemKind.Snippet,
+    insertText: `false`,
+    documentation: "if false"
+  }
+];

language-server/src/json-schema-document.js

@@ -129,9 +129,9 @@ export class JsonSchemaDocument {
         break;
 
       case "property":
-        if (node.children.length !== 2) {
-          return;
-        }
+        // if (node.children.length !== 2) {
+        //   return;
+        // }
 
         jsonNode.children = node.children.map((child) => {
           return this.#buildSchemaResources(child, uri, dialectUri, pointer, jsonNode);