dev: merging from master

This commit is contained in:
Matt Nish-Lapidus 2024-06-05 08:49:21 -04:00
commit 8fd4352f8e
23 changed files with 61 additions and 48 deletions

View file

@ -20,6 +20,7 @@
`(((:lang cc +lsp) :after ccls :require (dap-lldb dap-gdb-lldb))
((:lang elixir +lsp) :after elixir-mode :require dap-elixir)
((:lang go +lsp) :after go-mode :require dap-dlv-go)
((:lang gdscript +lsp) :after gdscript-mode :require dap-gdscript)
((:lang java +lsp) :after java-mode :require lsp-java)
((:lang php +lsp) :after php-mode :require dap-php)
((:lang python +lsp) :after python :require dap-python)

View file

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

View file

@ -3,17 +3,17 @@
(if (modulep! +eglot)
(progn
(package! eglot :pin "678610fdc544f10ac757ab7acf88ac7c5815ed5a")
(package! eglot :pin "e7e49c789c4019dd4cd4ab3880517d01592d81f9")
(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 "8861252880f6c2f6374a7bca2b945e6447eebd5a")
(package! lsp-ui :pin "942eeecc3d9a23ad006a3476885dfa7cbb5e207e")
(package! lsp-mode :pin "acad044ebc343c1eff0d9a875a13fb34ad113a9e")
(package! lsp-ui :pin "00f1fecdfb41c30428734cf27e492f26f46627fb")
(when (modulep! :completion ivy)
(package! lsp-ivy :pin "9ecf4dd9b1207109802bd1882aa621eb1c385106"))
(when (modulep! :completion helm)
(package! helm-lsp :pin "c2c6974dadfac459b1a69a1217441283874cea92"))
(when (modulep! :completion vertico)
(package! consult-lsp :pin "f8db3252c0daa41225ba4ed1c0d178b281cd3e90")))
(package! consult-lsp :pin "68583913168bf66fd4d542b2517a2dcab19c447c")))

View file

@ -153,7 +153,7 @@ Only has an effect in GUI Emacs.")
;; All forge list modes are derived from `forge-topic-list-mode'
(map! :map forge-topic-list-mode-map :n "q" #'kill-current-buffer)
(when (not forge-add-default-bindings)
(map! :map magit-mode-map [remap magit-browse-thing] #'forge-browse-dwim
(map! :map magit-mode-map [remap magit-browse-thing] #'forge-browse
:map magit-remote-section-map [remap magit-browse-thing] #'forge-browse-remote
:map magit-branch-section-map [remap magit-browse-thing] #'forge-browse-branch))
(set-popup-rule! "^\\*?[0-9]+:\\(?:new-\\|[0-9]+$\\)" :size 0.45 :modeline t :ttl 0 :quit nil)

View file

@ -1,12 +1,12 @@
;; -*- no-byte-compile: t; -*-
;;; tools/magit/packages.el
(when (package! magit :pin "b5637d665c1e5bd5b76ffb072dbac387f37a5f63")
(when (package! magit :pin "f9268a959828d0c6ab26171dd2fb1ffc55e5ae70")
(when (modulep! +forge)
(package! forge :pin "ad94b5665de357347bfc52910eef46a79f74988d")
(package! forge :pin "c3675fd068767c694177a310d4fa0a01f81bb2d3")
(package! code-review
:recipe (:host github
:repo "doomelpa/code-review"
:files ("graphql" "code-review*.el"))
:pin "e4c34fa284da25d8e0bafbae4300f1db5bdcda44"))
(package! magit-todos :pin "332ce763f7336ea356964b92723678aa1ed4640f"))
(package! magit-todos :pin "501c8db90ab59f8b619618b9d10db2a32a113727"))