More language.fnl changes

src/fennel-ls/handlers.fnl

@@ -80,7 +80,8 @@ Every time the client sends a message, it gets handled by a function in the corr
         ;; regular symbol
         (language.search-main self file symbol {:stop-early? true} byte))
       result
-      (message.range-and-uri self result.file (or result.binding result.definition))
+      (if result.file
+        (message.range-and-uri self result.file (or result.binding result.definition)))
       (catch _ nil))))
 
 (λ requests.textDocument/references [self send {: position

src/fennel-ls/language.fnl

@@ -80,7 +80,9 @@ but that info does
 
 (λ search-symbol [self file symbol stack opts]
   (if (= (tostring symbol) :nil)
-    {:definition symbol : file}
+    (if (= 0 (length stack))
+      {:definition symbol : file}
+      nil)
     ;; TODO globals
     (case (. file.references symbol)
       to (search-assignment self file to (stack-add-multisym! stack symbol) opts))))
@@ -120,7 +122,7 @@ but that info does
         (search-val self file (. call 2) stack opts)
 
         (where (or :fn :lambda :λ))
-        (if (= multival 1)
+        (if (and (= multival 1) (= 0 (length stack)))
           {:definition call : file}) ;; BASE CASE !!
         ;; TODO expand-macros
 
@@ -151,7 +153,7 @@ but that info does
   (if (sym? symbol)
     (let [split (utils.multi-sym-split symbol (if ?byte (+ 1 (- ?byte symbol.bytestart))))
           stack (stack-add-split! [] split)]
-      (case (. METADATA (. SPECIALS (tostring symbol)))
+      (case (. METADATA (or (. MACROS (tostring symbol)) (. SPECIALS (tostring symbol))))
         metadata {:binding symbol : metadata}
         _ (case (. file.references symbol)
             ref (search-assignment self file ref stack opts)

test/goto-definition-test.fnl

@@ -104,6 +104,12 @@
           _response (c:definition :foo.fnl 1 8)]
       nil))
 
+  (it "doesn't crash when going to hashfn"
+    (let [c (create-client)
+          _ (c:open-file! :foo.fnl "#$...")
+          _response (c:definition :foo.fnl 0 0)]
+      nil))
+
   (it "can go through multival destructures"
     (let [c (doto (create-client)
                   (: :open-file! :foo.fnl "(local [x y] (values [1 2] [3 4]))\n(local (a b) (values {:x y : y} {: x : y}))\n(print b.x a)"))

test/hover-test.fnl

@@ -81,4 +81,18 @@
       (is (hover-x.result.contents.value:find "```fnl\n1\n```"))
       (is (hover-y.result.contents.value:find "```fnl\n2\n```"))
       (is (hover-z.result.contents.value:find "```fnl\n3\n```"))
-      nil)))
+      nil))
+
+  (it "hovers over a special"
+    (let [client (doto (create-client)
+                       (: :open-file! :foo.fnl "(do nil)"))
+          [hover-do] (client:hover :foo.fnl 0 2)]
+      (is.equal hover-do.result.contents.value
+                "```fnl\n(do ...)\n```\nEvaluate multiple forms; return last value.")))
+
+  (it "hovers over a builtin macro"
+    (let [client (doto (create-client)
+                       (: :open-file! :foo.fnl "(doto nil (print))"))
+          [hover-do] (client:hover :foo.fnl 0 2)]
+      (is.equal hover-do.result.contents.value
+                "```fnl\n(doto val ...)\n```\nEvaluate val and splice it into the first argument of subsequent forms."))))

test/init.fnl

@@ -23,4 +23,5 @@
 
 (let [{: passes : errors} (require :test.lust)]
   (print (.. passes " passes. " errors " errors."))
-  (os.exit errors))
+  (if (not= errors 0)
+    (os.exit errors)))