Simpler, more correct and efficient autodoc implementation.

Not that it was difficult: it's replacing an ugly kludge.

1 files changed, 27 insertions, 0 deletions

diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index db1c842..475a556 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -94,6 +94,33 @@
 (defsubst geiser-syntax--beginning-of-form ()
   (memq (char-after (point)) '(?\" ?\()))
 
+(defun geiser-syntax--scan-sexp ()
+  (let ((p (point))
+        (n -1)
+        prev
+        head)
+    (ignore-errors
+      (backward-up-list)
+      (save-excursion
+        (forward-char)
+        (skip-syntax-forward "^_w" p)
+        (when (setq head (symbol-at-point))
+          (while (< (point) p)
+            (setq n (1+ n))
+            (setq prev (symbol-at-point))
+            (forward-sexp))))
+      (if head (list head n prev) 'skip))))
+
+(defun geiser-syntax--scan-sexps ()
+  (save-excursion
+    (goto-char (or (nth 8 (syntax-ppss)) (point)))
+    (let* ((sap (symbol-at-point))
+           (path (and sap `((,sap 0))))
+           s)
+      (while (setq s (geiser-syntax--scan-sexp))
+        (when (listp s) (push s path)))
+      path)))
+
 (defun geiser-syntax--complete-partial-sexp (buffer begin end)
   (geiser-syntax--with-buffer
     (erase-buffer)