Move findNodeAtOffset

Author: jdesrosiers

language-server/src/json-node.js

@@ -45,23 +45,5 @@ export const annotation = (node, keyword, dialect = "https://json-schema.org/dra
   return Instance.annotation(node, keyword, dialect);
 };
 
-export const findNodeAtOffset = (node, offset, includeRightBound = false) => {
-  if (contains(node, offset, includeRightBound)) {
-    for (let i = 0; i < node.children.length && node.children[i].offset <= offset; i++) {
-      const item = findNodeAtOffset(node.children[i], offset, includeRightBound);
-      if (item) {
-        return item;
-      }
-    }
-
-    return node;
-  }
-};
-
-const contains = (node, offset, includeRightBound = false) => {
-  return (offset >= node.offset && offset < (node.offset + node.textLength))
-    || includeRightBound && (offset === (node.offset + node.textLength));
-};
-
 // eslint-disable-next-line import/export
 export * from "@hyperjump/json-schema/annotated-instance/experimental";

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

@@ -180,7 +180,7 @@ export class JsonSchemaDocument {
 
   findNodeAtOffset(offset) {
     for (const { schemaResource } of this.schemaResources) {
-      const node = JsonNode.findNodeAtOffset(schemaResource, offset);
+      const node = _findNodeAtOffset(schemaResource, offset);
       if (node) {
         return node;
       }
@@ -212,6 +212,24 @@ const getEmbeddedDialectUri = (node, dialectUri) => {
   }
 };
 
+const _findNodeAtOffset = (node, offset, includeRightBound = false) => {
+  if (contains(node, offset, includeRightBound)) {
+    for (let i = 0; i < node.children.length && node.children[i].offset <= offset; i++) {
+      const item = _findNodeAtOffset(node.children[i], offset, includeRightBound);
+      if (item) {
+        return item;
+      }
+    }
+
+    return node;
+  }
+};
+
+const contains = (node, offset, includeRightBound = false) => {
+  return (offset >= node.offset && offset < (node.offset + node.textLength))
+    || includeRightBound && (offset === (node.offset + node.textLength));
+};
+
 const nodeStep = (node, key) => {
   const property = node.children.find((property) => getNodeValue(property.children[0]) === key);
   return property?.children[1];