Ensure we always return a table from extract.word #385

Olical · Aug 7, 2022 · 08236a1 · 08236a1
1 parent 1945bca
commit 08236a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/fnl/conjure/extract.fnl b/fnl/conjure/extract.fnl
@@ -34,9 +34,11 @@
 
 (defn word []
   (if (ts.enabled?)
-    (when-let [node (ts.get-leaf)]
+    (if-let [node (ts.get-leaf)]
       {:range (ts.range node)
-       :content (ts.node->str node)})
+       :content (ts.node->str node)}
+      {:range nil
+       :content nil})
     (legacy-word)))
 
 (defn file-path []

diff --git a/lua/conjure/extract.lua b/lua/conjure/extract.lua
@@ -52,7 +52,7 @@ local function word()
     if node then
       return {range = ts.range(node), content = ts["node->str"](node)}
     else
-      return nil
+      return {range = nil, content = nil}
     end
   else
     return legacy_word()