dev: merge branch 'master' into emenel

modules/tools/ansible/packages.el

@@ -1,7 +1,7 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/ansible/packages.el
 
-(package! ansible :recipe (:nonrecursive t) :pin "1d7de8d3ddac980715eebd87ee66859f8665b101")
+(package! ansible :recipe (:nonrecursive t) :pin "b4dca00f89334392d770a7a67fffc935ec7354aa")
 (package! ansible-doc :pin "86083a7bb2ed0468ca64e52076b06441a2f8e9e0")
 (package! jinja2-mode :pin "03e5430a7efe1d163a16beaf3c82c5fd2c2caee1")
 (package! yaml-mode :pin "7b5ce294fb15c2c8926fa476d7218aa415550a2a")

modules/tools/biblio/packages.el

@@ -8,10 +8,10 @@
   (package! bibtex-completion :pin "8b71b4f5ce62eeaf18067f57faaddc06449fbe1c")
   (package! helm-bibtex :pin "8b71b4f5ce62eeaf18067f57faaddc06449fbe1c"))
 (when (modulep! :completion vertico)
-  (package! citar :pin "885b86f6733fd70f42c32dd7791d3447f93db990")
-  (package! citar-embark :pin "885b86f6733fd70f42c32dd7791d3447f93db990")
+  (package! citar :pin "07d2a63c99fe35cbd468f8e6a322de05f1a29469")
+  (package! citar-embark :pin "07d2a63c99fe35cbd468f8e6a322de05f1a29469")
   (when (modulep! :lang org +roam2)
     (package! citar-org-roam :pin "82d47b5df1926627f56a09055c69b49b31cbbb9f")))
 
 (package! parsebib :pin "ace9df707108b17759c004c7387655277122d4c1")
-(package! citeproc :pin "44f90cb296766e03fffc28b7892521ab0e8709f1")
+(package! citeproc :pin "cfa30b6c95c7465a05da98eccf273608880b22d7")

modules/tools/collab/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/collab/packages.el
 
-(package! crdt :pin "4a18cd8539c8f3364e3ae903580328dd8b05fa78")
+(package! crdt :pin "9bf99e2ce35d23c3d60ad245b77ab3b5313184d4")

modules/tools/debugger/packages.el

@@ -6,5 +6,5 @@
     (package! realgud-trepan-ni :pin "0ec088ea343835e24ae73da09bea96bfb02a3130")))
 
 (when (modulep! +lsp)
-  (package! dap-mode :pin "11431a26bc4c8ca92b097dbdbcbdc9e3d7fb5583")
+  (package! dap-mode :pin "b407773ebca56e3bd8e6a4643854e91cbde0c35e")
   (package! posframe :pin "f4e9e509ba96ceb3c2b2b054957291607fb52651"))

modules/tools/direnv/packages.el

@@ -1,4 +1,4 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/direnv/packages.el
 
-(package! envrc :pin "8eb7401700b0080902ce200ad610ff8d2f2dcc27")
+(package! envrc :pin "2316e004c1574234fe4d991bd75a254cdeaa83ae")

modules/tools/editorconfig/packages.el

@@ -3,4 +3,4 @@
 
 (package! editorconfig
   :recipe (:nonrecursive t)
-  :pin "d73b6392ded0476af93ec7ba75cca2909aa8d2dc")
+  :pin "1651294334f3987d749eeb287f11d256cf2ba5b1")

modules/tools/eval/packages.el

@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/eval/packages.el
 
-(package! quickrun :pin "373634cf5143f9680164e27fa844d3b02408e917")
+(package! quickrun :pin "c58e2e4be58416fbb467b3bb191470a61408751c")
 (when (modulep! +overlay)
   (package! eros :pin "a9a92bdc6be0521a6a06eb464be55ed61946639c"))

modules/tools/lookup/autoload/lookup.el

@@ -263,29 +263,41 @@ current buffer."
                     (<  pt end))))))))
 
 (defun +lookup-ffap-backend-fn (identifier)
-  "Tries to locate the file at point (or in active selection).
-Uses find-in-project functionality (provided by ivy, helm, or project),
-otherwise falling back to ffap.el (find-file-at-point)."
-  (let ((guess
+  "Tries to locate the file or URL at point (or in active selection).
+
+See `ffap-alist' for ways to tweak how files are resolved. Falls back to
+whatever find-in-project functionality is available in your active completion
+framework (ivy, helm, vertico, etc), otherwise falling back to
+`find-file-at-point''s file prompt."
+  (let ((initial-buffer (current-buffer))
+        (guess
          (cond (identifier)
                ((doom-region-active-p)
                 (buffer-substring-no-properties
                  (doom-region-beginning)
                  (doom-region-end)))
-               ((if (require 'ffap) (ffap-guesser)))
+               ((if (require 'ffap) (ffap-guesser))) ; Powerful! See `ffap-alist'
                ((thing-at-point 'filename t)))))
     (cond ((and (stringp guess)
                 (or (file-exists-p guess)
                     (ffap-url-p guess)))
            (find-file-at-point guess))
-          ((and (modulep! :completion ivy)
-                (doom-project-p))
+          ;; Walk the file tree up to the project's root for relative paths.
+          ((and (stringp guess)
+                ;; Only do this with paths that contain segments, to reduce
+                ;; false positives.
+                (string-match-p "/" guess)
+                (when-let ((dir (locate-dominating-file default-directory guess)))
+                  (when (file-in-directory-p dir (doom-project-root))
+                    (find-file (doom-path dir guess))
+                    t))))
+          ;; Fallback prompters
+          ((and (modulep! :completion ivy) (doom-project-p))
            (counsel-file-jump guess (doom-project-root)))
-          ((and (modulep! :completion vertico)
-                (doom-project-p))
+          ((and (modulep! :completion vertico) (doom-project-p))
            (+vertico/consult-fd-or-find (doom-project-root) guess))
           ((find-file-at-point (ffap-prompter guess))))
-    t))
+    (not (eq initial-buffer (current-buffer)))))
 
 (defun +lookup-bug-reference-backend-fn (_identifier)
   "Searches for a bug reference in user/repo#123 or #123 format and opens it in

modules/tools/lookup/packages.el

@@ -8,7 +8,7 @@
   (package! helm))
 
 ;;
-(package! dumb-jump :pin "ede6a04187e79a29ef31d14760ac0d8d4c5f4cc5")
+(package! dumb-jump :pin "3c2ab8dfff3a10d3c5f2efd69cfbc81fb5dbbd39")
 (when (modulep! :completion ivy)
   (package! ivy-xref :pin "a82e8e117d2dd62c28b6a3e3d6e4cfb11c0bda38"))
 (when (modulep! :completion helm)

modules/tools/lsp/packages.el

@@ -3,13 +3,13 @@
 
 (if (modulep! +eglot)
     (progn
-      (package! eglot :pin "e7e49c789c4019dd4cd4ab3880517d01592d81f9")
+      (package! eglot :pin "850cbd043084d7cc571e1090a4812db6e3f7d0bc")
       (when (modulep! :completion vertico)
         (package! consult-eglot :pin "64262e72452f8fe6dd49d31bcdd4bd577b7d682d"))
       (when (and (modulep! :checkers syntax)
              (not (modulep! :checkers syntax +flymake)))
         (package! flycheck-eglot :pin "114e1315aaf0dc3196da67da426bbe2b46384fe2")))
-  (package! lsp-mode :pin "acad044ebc343c1eff0d9a875a13fb34ad113a9e")
+  (package! lsp-mode :pin "cec9e56390e90d7ced3b18a922ab954e782b8628")
   (package! lsp-ui :pin "00f1fecdfb41c30428734cf27e492f26f46627fb")
   (when (modulep! :completion ivy)
     (package! lsp-ivy :pin "9ecf4dd9b1207109802bd1882aa621eb1c385106"))

modules/tools/magit/autoload.el

@@ -108,7 +108,7 @@ modified."
 
 ;;;###autoload
 (defun +magit-revert-buffer-maybe-h ()
-  "Update `vc' and `git-gutter' if out of date."
+  "Update `vc' and `diff-hl' if out of date."
   (when +magit--stale-p
     (+magit--revert-buffer (current-buffer))))
 

modules/tools/magit/packages.el

@@ -1,9 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/magit/packages.el
 
-(when (package! magit :pin "f9268a959828d0c6ab26171dd2fb1ffc55e5ae70")
+(when (package! magit :pin "ea0f07e54967197ac0b072a69ba314314a4080c1")
   (when (modulep! +forge)
-    (package! forge :pin "c3675fd068767c694177a310d4fa0a01f81bb2d3")
+    (package! forge :pin "4adb94d23c8f28ea3b15757936c2203b3376586a")
     (package! code-review
       :recipe (:host github
                :repo "doomelpa/code-review"

modules/tools/pdf/packages.el

@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/pdf/packages.el
 
-(package! pdf-tools :pin "a1048bceb2bd3f635437b0f2bfac27cae8c2dabc")
+(package! pdf-tools :pin "30b50544e55b8dbf683c2d932d5c33ac73323a16")
 (package! saveplace-pdf-view :pin "ee95460cd934080338f03a16f95b549577425216")

modules/tools/rgb/packages.el

@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/rgb/packages.el
 
-(package! rainbow-mode :pin "70ed10d410ef00c82c49b2ba41647930626d6218")
+(package! rainbow-mode :pin "0740f31f300982534183a2f60b1918de418a6f2c")
 (package! kurecolor :pin "fbf98e1e384dd11bbb5764ae54b36353f0691d1e")

modules/tools/tree-sitter/packages.el

@@ -1,8 +1,8 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/tree-sitter/packages.el
 
-(package! tree-sitter :pin "3cfab8a0e945db9b3df84437f27945746a43cc71")
-(package! tree-sitter-langs :pin "b7895ca759563f3c7c3b928eb4f816bb4099d866")
+(package! tree-sitter :recipe (:branch "master") :pin "02fe7b86d92b1aab954045146469b7893f0ab371")
+(package! tree-sitter-langs :pin "a06804e13fc1d24d0099b44ce23d6ac5e6bac5b8")
 (package! tree-sitter-indent :pin "4ef246db3e4ff99f672fe5e4b416c890f885c09e")
 
 (when (modulep! :editor evil +everywhere)