From b61e491f2e961894edfcffcb586ca33b3eb8577e Mon Sep 17 00:00:00 2001
From: Andrew Dupont <github@andrewdupont.net>
Date: Thu, 13 Jun 2024 14:07:41 -0700
Subject: [PATCH] Handle failed node descriptor lookups more gracefully

We made this change in one place, but not in another. The real fix is to make both places use the same copy of `resolveNodeDescriptor`, but that'll have to wait another month.
---
 src/wasm-tree-sitter-language-mode.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wasm-tree-sitter-language-mode.js b/src/wasm-tree-sitter-language-mode.js
index b28fbc879..d23cdb7df 100644
--- a/src/wasm-tree-sitter-language-mode.js
+++ b/src/wasm-tree-sitter-language-mode.js
@@ -79,7 +79,7 @@ function resolveNodePosition(node, descriptor) {
   let result = parts.length === 0 ?
     node :
     resolveNodeDescriptor(node, parts.join('.'));
-
+  if (!result) { return null; }
   return result[lastPart];
 }
 
@@ -2535,6 +2535,7 @@ class FoldResolver {
         let value = options[key];
         end = this.applyFoldAdjustment(key, end, node, value, props, this.layer);
       }
+      if (!end) { return null; }
 
       end = Point.fromObject(end, true);
       end = this.buffer.clipPosition(end);