Add isEmbeddedSchema flag to SchemaNode to fix findNodeAtOffset

Author: jdesrosiers

language-server/src/features/completion/if-then-completion.test.ts

@@ -74,7 +74,7 @@ describe("Feature - if/then completion", () => {
 
   test("if/then completion on property value", async () => {
     await client.writeDocument("subject.schema.json", `{
-  "if": ""
+  "if": {}
 }`);
     documentUri = await client.openDocument("subject.schema.json");
 

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

@@ -164,6 +164,8 @@ const fromJsonc = (node, uri, pointer, dialectUri, parent, schemaLocations = new
         childSchemaNode.keywordUri = propertyKeywordUri;
         if (childSchemaNode.pointer !== "") {
           schemaNode.children.push(childSchemaNode);
+        } else {
+          schemaNode.isEmbeddedSchema = true;
         }
       }
       break;
@@ -182,7 +184,7 @@ const isValueNode = (node) => {
 export const findNodeAtOffset = (document, offset) => {
   for (const schemaResource of document.schemaResources) {
     const node = _findNodeAtOffset(schemaResource, offset);
-    if (node) {
+    if (node && !node.isEmbeddedSchema) {
       return node;
     }
   }

language-server/src/model/schema-node.js

@@ -23,6 +23,7 @@ import { normalizeUri } from "../util/util.js";
  *   dialectUri?: string;
  *   anchors: Record<string, string>;
  *   isSchema: boolean;
+ *   isEmbeddedSchema: boolean;
  *   keywordUri: string | undefined;
  *   embedded: Record<string, SchemaNode>;
  * }} SchemaNode
@@ -46,6 +47,7 @@ export const cons = (uri, pointer, value, type, parent, offset, textLength, dial
   node.dialectUri = dialectUri;
   node.anchors = parent?.anchors ?? {};
   node.embedded = parent?.embedded ?? {};
+  node.isEmbeddedSchema = false;
 
   if (node.baseUri !== parent?.baseUri) {
     node.embedded[uri] = node;