Update server.js and json-instance.js for schema completion

hyperjump-io · Mar 20, 2024 · eba5da0 · eba5da0
1 parent 72e65b9
commit eba5da0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/language-server/src/jsonc-instance.js b/language-server/src/jsonc-instance.js
@@ -1,4 +1,4 @@
-import { findNodeAtLocation, findNodeAtOffset, parseTree } from "jsonc-parser";
+import { findNodeAtLocation, findNodeAtOffset, parseTree, getNodePath } from "jsonc-parser";
 import * as JsonPointer from "@hyperjump/json-pointer";
 import { getKeywordId } from "@hyperjump/json-schema/experimental";
 import { find, some } from "@hyperjump/pact";
@@ -179,10 +179,11 @@ export class JsoncInstance {
     return this.node.length;
   }
 
-  findProperty(instance) {
-    const keyNode = findNodeAtOffset(instance.root, instance.node.children[0]?.children[0]?.offset);
-    const valNode = findNodeAtOffset(instance.root, instance.node.children[0]?.children[1]?.offset);
-    return { key: keyNode, value: valNode };
+  getInstanceAtPosition(position) {
+    const node = findNodeAtOffset(this.root, this.textDocument.offsetAt(position));
+    const pathToNode = getNodePath(node);
+    const pointer = pathToNode.reduce((pointer, segment) => JsonPointer.append(segment, pointer), "");
+    return new JsoncInstance(this.textDocument, this.root, node, pointer, this.annotation);
   }
 }
 

diff --git a/language-server/src/server.js b/language-server/src/server.js
@@ -362,20 +362,29 @@ connection.languages.semanticTokens.onDelta(async ({ textDocument, previousResul
 
 // $SCHEMA COMPLETION
 connection.onCompletion((textDocumentPosition) => {
-  connection.console.log("called");
   const doc = documents.get(textDocumentPosition.textDocument.uri);
   if (!doc) {
     return [];
   }
 
   const instance = JsoncInstance.fromTextDocument(doc);
-  const currentProperty = instance.findProperty(instance);
 
-  if (currentProperty?.key?.value === "$schema" && currentProperty?.value?.value === "") {
+  const currentProperty = instance.getInstanceAtPosition(textDocumentPosition.position);
+  if (currentProperty.pointer.endsWith("/$schema")) {
     return getDialectIds().map((uri) => {
+      const range = {
+        start: currentProperty.startPosition(),
+        end: {
+          line: currentProperty.endPosition().line,
+          character: currentProperty.endPosition().character + 1
+        }
+      };
       return {
-        label: uri,
-        kind: CompletionItemKind.Keyword
+        label: `"${uri}"`,
+        kind: CompletionItemKind.Keyword,
+        textEdit: {
+          range: range
+        }
       };
     });
   }