From b7c7bef47f16fff662e8b277b052b387edbf2a02 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 20 Nov 2023 00:48:31 +0000 Subject: [PATCH] chore(deps): upgrade packages tweak config for lsp-mode changes Minor changes were needed due to recent lsp-mode changes. My custom the bufls and golangci-lint clients are now part of lsp-mode. Also, within Ruby buffers I need to disable the vue-semantic-server client, as that seems to take priority over Ruby clients in Rails projects that use Vue. --- modules/languages/siren-golang.el | 2 +- modules/languages/siren-protobuf.el | 3 +- modules/languages/siren-ruby.el | 1 + straight/versions/default.el | 206 +++++++++--------- vendor/lsp-bufls/lsp-bufls.el | 66 ------ vendor/lsp-golangci-lint/lsp-golangci-lint.el | 163 -------------- 6 files changed, 106 insertions(+), 335 deletions(-) delete mode 100644 vendor/lsp-bufls/lsp-bufls.el delete mode 100644 vendor/lsp-golangci-lint/lsp-golangci-lint.el diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el index 70c3ece..5137018 100644 --- a/modules/languages/siren-golang.el +++ b/modules/languages/siren-golang.el @@ -129,7 +129,7 @@ (golines-format-buffer))) (use-package lsp-golangci-lint - :straight (:type built-in) ;; from vendor directory + :straight lsp-mode :custom (lsp-golangci-lint-server-debug nil)) diff --git a/modules/languages/siren-protobuf.el b/modules/languages/siren-protobuf.el index 812e937..a8ee4e6 100644 --- a/modules/languages/siren-protobuf.el +++ b/modules/languages/siren-protobuf.el @@ -64,8 +64,7 @@ See URL `https://github.com/bufbuild/buf'." (add-to-list 'flycheck-checkers 'protobuf-buf)) (use-package lsp-bufls - ;; from vendor directory - :straight (:type built-in)) + :straight lsp-mode) (provide 'siren-protobuf) ;;; siren-protobuf.el ends here diff --git a/modules/languages/siren-ruby.el b/modules/languages/siren-ruby.el index 365b897..4bce26c 100644 --- a/modules/languages/siren-ruby.el +++ b/modules/languages/siren-ruby.el @@ -103,6 +103,7 @@ :preface (defun siren-lsp-ruby-mode-setup () + (setq-local lsp-disabled-clients '(vue-semantic-server)) (setq-local siren-lsp-manual-format-buffer-func 'siren-lsp-ruby-manual-format-buffer) (lsp-format-buffer-on-save-mode t) diff --git a/straight/versions/default.el b/straight/versions/default.el index c9e55a9..5fff73f 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -1,54 +1,54 @@ (("a.el" . "93e5ed8c495794d1ba3c04b43041b95ce01079b1") ("ace-window" . "77115afc1b0b9f633084cf7479c767988106c196") - ("all-the-icons.el" . "f491f39c21336d354e85bdb4cca281e0a0c2f880") + ("all-the-icons.el" . "be9d5dcda9c892e8ca1535e288620eec075eb0be") ("anzu" . "5abb37455ea44fa401d5f4c1bdc58adb2448db67") - ("applescript-mode" . "1794b782be966d3994dc89ffe48b440f08ecf91b") + ("applescript-mode" . "1e04ff20745fbf8aac9279aa4e144957c5e2b224") ("avy" . "be612110cb116a38b8603df367942e2bb3d9bdbe") - ("beginend" . "61f1eb22718fcd9796b47a98702d161ff323a532") + ("beginend" . "26d6142ceaf7c58705281852410b61ddc0d780ee") ("better-jumper" . "47622213783ece37d5337dc28d33b530540fc319") ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470") ("bundler.el" . "43efb6be4ed118b06d787ce7fbcffd68a31732a7") ("caddyfile-mode" . "fc41148f5a7eb320f070666f046fb9d88cf17680") - ("cape" . "5b28cd43f2efa19dbf5053f164cce622a4b5bdae") + ("cape" . "abacb231157e0c90e29bdda6d15b4b448e48ffbd") ("cargo-transient" . "34d63dfb99ee9a6068dadd6390763c9735c17a85") ("cargo.el" . "225fdb846c702a193e58a98c1585bb3586a9aa86") ("centaur-tabs" . "0bb1aa18d475319df85f192dce3327802866c3c3") ("cfrs" . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121") - ("chatgpt-shell" . "c1e6cbe3e3884b89bb45f3fc63157a0126b38814") - ("closql" . "85ac7b8a894a4e259439d79eb6bd6f5129770905") + ("chatgpt-shell" . "50984ba1e833be89c41b9779e8dca5d04cb16a29") + ("closql" . "909752e2aa946bd91b27a1813982e2b20ae27dde") ("code-review" . "26f426e99221a1f9356aabf874513e9105b68140") - ("coffee-mode" . "35a41c7d8233eac0b267d9593e67fb8b6235e134") + ("coffee-mode" . "1c6adeae14f3795d3b1e44321189ed7c2c93c967") ("company-box" . "b6f53e26adf948aca55c3ff6c22c21a6a6614253") - ("company-mode" . "3ec40b0a0ea751b6c48f24abd58c8304deb53014") + ("company-mode" . "d9d54abaf78da1e62fad7def8eeeb4c41110725d") ("company-nginx" . "8a9f1a5653fe2d9a5042bfb9377d54f37fcc64c8") - ("compat" . "a20862e377a137961dd82706a7654a090210f7f7") - ("consult" . "be4fdb6246fb2cada13459fbabae5dd0553e1fd9") - ("consult-dir" . "3268ec3f7194c086ecfbd2863e029f42d91b77c1") + ("compat" . "b6b64e004cd35b8fe3c40fe5ca250826f65a3369") + ("consult" . "04c89250e7eb1bffd822bcfa57b6049af6da2ea6") + ("consult-dir" . "3f5f4b71ebe819392cb090cda71bd39a93bd830a") ("consult-lsp" . "f8db3252c0daa41225ba4ed1c0d178b281cd3e90") - ("copilot.el" . "3086d214f40a9689d00d647667b73795abc07bc9") - ("csv-mode" . "d190a479b4f36806b604da527e5d5a50909d3ceb") + ("copilot.el" . "30a054f8569550853a9b6f947a2fe1ded7e7cc6b") + ("csv-mode" . "ec958a8f92c41726f91f188d75e176eb1bdf4252") ("cucumber.el" . "c08e4fa64bf3e9e354fd7f9f058916ba607e6631") - ("cycle-quotes" . "c4d62848127d03b27f897f9b290ba5cef9fb0845") - ("dap-mode" . "b79b32af1cd94386b098dc762c883fa00eeaa07f") - ("dart-mode" . "9c846769abd37f7fdc7ba8388d1f3a2b844b75e3") + ("cycle-quotes" . "03a73a79d02455f83bb94e66b61414b9efc5b8b3") + ("dap-mode" . "755845ae053bbfdd3f7b3dca13efa4be480370b5") + ("dart-mode" . "61e01142352f6813aca6512bedadb5007de3a0b9") ("dash-at-point" . "fba1a6f42ea51d05110e12c62bdced664059eb55") - ("dash.el" . "f46268c75cb7c18361d3cee942cd4dc14a03aef4") + ("dash.el" . "6db80c711ce947f6c6fa11e5c2257fff2c79d139") ("desktop-plus" . "88055cee526a000056201898499cebbd35e3ea76") - ("diff-hl" . "d9e34f7b8110b7f753c237d0d0b3f267f3ca4779") + ("diff-hl" . "b5651f1c57b42e0f38e01a8fc8c7df9bc76d5d38") ("dired-hacks" . "874449d6fc98aee565e1715ec18acec3c1c2cafb") - ("dired-plus" . "850f80756b4e95035735e4af3ce5da31f612de13") + ("dired-plus" . "377ec04347b8dd8a91df1a33d820fa862fe0efa8") ("dirvish" . "119f9f59a618bb7b476c93e9ab1d7542c5c1df41") - ("docker.el" . "df141addfec256cfb943fa1823b4b2ad8f461fa9") - ("doom-modeline" . "1eb1a10e18a2e87451ef7f670f5d4fc1e608b85c") + ("docker.el" . "d5255a65b7240d0038cc417f301b43df05a27922") + ("doom-modeline" . "dc15e932d8be149c9417a00898db229d9a2f8e6f") ("dumb-jump" . "d9503c157ab88f0ed2fa1301aeb57e95ac564760") ("edit-indirect" . "f80f63822ffae78de38dbe72cacaeb1aaa96c732") - ("editorconfig-emacs" . "df0e5180db1d1267c9ea39abbe98b7993e83bae7") - ("el-get" . "f3f1edd434221dc6daef565ebf77fa40c4cead36") - ("eldoc" . "bf2e88dcf00e6554e24b517aa315527011042fae") - ("elisp-refs" . "bf3cca8f74065b1b31036f461e3a093b162311bd") + ("editorconfig-emacs" . "4bf871b7a2f2433d1032ef2b251bfb08c23347f4") + ("el-get" . "a5ba5852648a90ee0cde9fb5d72e69497d260eec") + ("eldoc" . "7dd56ba328a126a237115c13f653e5f34fda8989") + ("elisp-refs" . "541a064c3ce27867872cf708354a65d83baf2a6d") ("elisp-tree-sitter" . "3cfab8a0e945db9b3df84437f27945746a43cc71") ("emacs-aio" . "da93523e235529fa97d6f251319d9e1d6fc24a41") - ("emacs-async" . "bb0509060ddc9c94bc7db7bddb12995acb3b53e4") + ("emacs-async" . "3bade0e92e1ee8e716c5db14bc8315b17299f138") ("emacs-deferred" . "2239671d94b38d92e9b28d4e12fd79814cfb9c16") ("emacs-direnv" . "14f74269af34f8c30ab4a521eff290b74460daed") ("emacs-emojify" . "1b726412f19896abf5e4857d4c32220e33400b55") @@ -57,107 +57,107 @@ ("emacs-libvterm" . "94e2b0b2b4a750e7907dacd5b4c0584900846dd1") ("emacs-lorem-ipsum" . "4e87a899868e908a7a9e1812831d76c8d072f885") ("emacs-memoize" . "51b075935ca7070f62fae1d69fe0ff7d8fa56fdd") - ("emacs-reformatter" . "bfe3f1c6ece952d39921db16f601123bdd1748ab") + ("emacs-reformatter" . "af56cd5e47c3732f9d972fc8fd64ceca1e0bf4b7") ("emacs-request" . "01e338c335c07e4407239619e57361944a82cb8a") - ("emacs-shfmt" . "12ed73dafe0df62704c048b20ad9a31994625dbc") + ("emacs-shfmt" . "214bce65caaab707a90b3da597f7048e2d31c0d8") ("emacs-slim" . "3636d18ab1c8b316eea71c4732eb44743e2ded87") ("emacs-solaire-mode" . "8af65fbdc50b25ed3214da949b8a484527c7cc14") ("emacs-undo-fu" . "0e22308de8337a9291ddd589edae167d458fbe77") ("emacs-undo-fu-session" . "7b3fd0647dd1fbd02101eec61440e6d44953bcd9") - ("emacs-which-key" . "df6b0cb8449812e7fb200bc852107fa7eb708496") - ("emacsmirror-mirror" . "cd860dfc8c2a2a8a6b22907fccdbec4295349beb") - ("emacsql" . "64012261f65fcdd7ea137d1973ef051af1dced42") - ("embark" . "5b56203a4511e434ee5c200f90775f0ea6d0c94b") + ("emacs-which-key" . "4d20bc852545a2e602f59084a630f888542052b1") + ("emacsmirror-mirror" . "5cbbb0a404ce3aa1cedd3fd9dea4f0b80cd89a3a") + ("emacsql" . "59de83a1276a5fbcf8a682b64bbdcf5e00c6ce8b") + ("embark" . "3f08fc8ede9dddad3752223e01643058594781b2") ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") ("esxml" . "225693096a587492d76bf696d1f0c25c61f7d531") - ("exec-path-from-shell" . "03fc0a38af9e396c98f5a30c392cf757b3a34feb") - ("expand-region.el" . "b70feaa644310dc2d599dc277cd20a1f2b6446ac") + ("exec-path-from-shell" . "99b1b731d55614dceb72b6f16602df2b8d030dc9") + ("expand-region.el" . "9e3f86c02c5e2ab6f0d95da8a34045b54f6166d1") ("explain-pause-mode" . "2356c8c3639cbeeb9751744dbe737267849b4b51") - ("f.el" . "19e1da061e759b05e8c480b426287a063ca39484") + ("f.el" . "ab3ee3811c53f9c2144ff45130361f3da242ffa2") ("fbthrift" . "52c465de9b6ed37de55ace97d2ceb95a177543cf") - ("flutter.el" . "edd3f5eb3f4603142f45c5890ee70b0dfb10772b") + ("flutter.el" . "285eb8646cd37eb4ed997124d1ad71fea2cbe6b7") ("flx" . "7b44a5abb254bbfbeca7a29336f7f4ebd8aabbf2") - ("flx-rs" . "8c56c4745629814addd806b8e7e1d553653a7ddf") - ("flycheck" . "5f2ef177cb21ae8b73714575802beef04abd0f5e") - ("flycheck-package" . "3a6aaed29ff61418c48c0251e1432c30748ae739") + ("flx-rs" . "769b5070d56d111a96b1086105685de54e2c5c6b") + ("flycheck" . "e56e30d8c66ffc9776d07740658d3b542c1a8e21") + ("flycheck-package" . "75efa098cf17dc14c363e2ca9b68afdac7766b5b") ("flycheck-rust" . "a139cd53c5062697e9ed94ad80b803c37d999600") - ("flyspell-correct" . "7d7b6b01188bd28e20a13736ac9f36c3367bd16e") - ("forge" . "ecbcce94a5581077f8e1cda3e3f2a66c6dd52766") + ("flyspell-correct" . "1e7a5a56362dd875dddf848b9a9e25d1395b9d37") + ("forge" . "5dcca0e0c0378499b086543be2ec292ddd8beb5b") ("frame-local" . "7ee1106c3bcd4022f48421f8cb1ef4f995da816e") - ("fussy" . "9cd9fef9c0b319f7e33f687760cc6efe7e11faba") + ("fussy" . "2ff8317c403b15d3c898f7dcd8511b6d16f92c1d") ("gcmh" . "0089f9c3a6d4e9a310d0791cf6fa8f35642ecfd9") ("general.el" . "833dea2c4a60e06fcd552b653dfc8960935c9fb4") ("gh-notify" . "e1afdd49deb8ddf1a988e8d3fa699b06dfa92f5f") - ("ghub" . "0fd648f0529f34b5da441d54c9dbff7810477d12") + ("ghub" . "0d7c81eee3ba0c6e029605e545173721c39947d7") ("git-link" . "aded95807f277f30e1607313bdf9ac9a016a2305") - ("git-modes" . "44d536ba637235c9dd203410281397417a3e60b6") + ("git-modes" . "399b1b446644afce8d0949ff85a882bfdbbfb7bf") ("git-timemachine" . "ac933e5cd29583c131401f3bd991d98129c316df") ("github-browse-file" . "9742a5183af853788c6ecb83fb7ee0b00d1675ac") ("github-review" . "725fbc7b385228f53a7ddc46a92c1276bab4aea8") - ("gnu-elpa-mirror" . "be1351c478935b8348c19d3197cd5d84330c708d") + ("gnu-elpa-mirror" . "3e9da80a174721e8b7a229a294c8ac977bd29af5") ("go-dlv.el" . "0a296bc3b7b4dcf0c140a78c5ca3e1a8c6b7ea1a") ("go-eldoc" . "cbbd2ea1e94a36004432a9ac61414cb5a95a39bd") ("go-gen-test" . "af00a9abbaba2068502327ecdef574fd894a884b") - ("go-mode.el" . "f21347ae9cf68ea33031bf5125896e8f16c8183c") + ("go-mode.el" . "8dce1e3ba1cdc34a856ad53c8421413cfe33660e") ("go-playground" . "a1a957b60054ad5038c086e03834ae0fba656dd1") ("go-projectile" . "ad4ca3b5695a0e31e95e3cc4ccab498f87d68303") ("gotest.el" . "490189e68d743a851bfb42d0017428a7550e8615") - ("gptel" . "0f161a466b880cde864d8aa709ec04e1a86f445a") + ("gptel" . "17a58d38e7299f254d02c29bbcc9211146394758") ("groovy-emacs-modes" . "7b8520b2e2d3ab1d62b35c426e17ac25ed0120bb") - ("haml-mode" . "fe83c65c1f002f7c36480b758727c1afbad9a1b2") - ("haskell-mode" . "e8358945845b15cbcc4c1479e51b5236bac61b72") + ("haml-mode" . "a64d58df8f098f858c6c11fa1629a90969f9c7e8") + ("haskell-mode" . "8d0f44bfe2a9ab6b0969c9bafb75089f315ff5ae") ("hcl-mode" . "751b79247f326ab52e00032e805775c37ad9f080") - ("helm" . "a3385dfa5d0e2d06bf83b12c95e0783b297f5272") - ("helm-ag" . "fd5da399994f6de7c5a6ead9942dc85a80e0017f") + ("helm" . "74887ba26071fba4c66ac3b4dc11d7d632832394") + ("helm-ag" . "501af5cc7d9e9ae4473d84ba1ffb047ad8ef7fae") ("helm-descbinds" . "b72515982396b6e336ad7beb6767e95a80fca192") ("helm-describe-modes" . "11fb36af119b784539d31c6160002de1957408aa") ("helm-lsp" . "c2c6974dadfac459b1a69a1217441283874cea92") ("helm-make" . "ebd71e85046d59b37f6a96535e01993b6962c559") - ("helm-posframe" . "87461b52b6f3f378c63642a33f584d4a4ba28351") + ("helm-posframe" . "0b6bb016f0ff4980860a9d00574de311748c40b0") ("helm-swoop" . "1b3285791f1dc1fde548fe67aec07214d698fd57") ("helm-xref" . "ea0e4ed8a9baf236e4085cbc7178241f109a53fa") - ("helpful" . "6f8991a72c83d904725a9d6c00de2cabbef32de9") + ("helpful" . "a32a5b3d959a7fccf09a71d97b3d7c888ac31c69") ("highlight-indent-guides" . "cf352c85cd15dd18aa096ba9d9ab9b7ab493e8f6") ("ht.el" . "1c49aad1c820c86f7ee35bf9fff8429502f60fef") ("httprepl.el" . "cfa3693267a8ed1c96a86a126823f37dbfe077d8") ("hydra" . "317e1de33086637579a7aeb60f77ed0405bf359b") ("imenu-anywhere" . "06ec33d79e33edf01b9118aead1eabeae8ee08b1") - ("inf-ruby" . "5a8b87fe6873bc684552cd993e375c382d729753") + ("inf-ruby" . "991fe74b1c1b83412b42832a39aafc2d88ae625c") ("jinja2-mode" . "03e5430a7efe1d163a16beaf3c82c5fd2c2caee1") ("js2-mode" . "79bc78d77db0d2e8e43dc0f9e0504ad90bcbc26d") ("json-mode" . "481d5d9f4003fc14d116bf31d1bf71d14960d7d9") ("json-snatcher" . "b28d1c0670636da6db508d03872d96ffddbc10f2") ("jsonnet-mode" . "e93a1f55e5f9bc2b34b025c6f7a60a6f159268d1") - ("jsonrpc" . "ba4275ef5bcbfceebd7049c5669dec9edabcb1fc") - ("kubernetes-el" . "b0fb60564e818c30d6fc8744e229c8ed0707ce7a") - ("let-alist" . "021fc10df2e44faba4728d849ee767cf890aa51a") + ("jsonrpc" . "768f955f702a471c47f7ca1cf6ef57e5838892d5") + ("kubernetes-el" . "423c216fdef06d32dde835bb91daff353f41b72e") + ("let-alist" . "0c968ff216a2c91080d79272e85132fef6f14988") ("list-utils" . "f02dcef36330871855346f9eab97eef58d323d9a") ("loop.el" . "9db6372791bbd0cf3fa907ed0ae3e6b7bcf6cc57") - ("lsp-docker" . "175b587e0def23d4560abdb06b12e05ea469aaea") - ("lsp-mode" . "2346840947b833b351d74056a86a8f1fb124d22f") - ("lsp-origami" . "746b855d66af17f9741face7d6b949bf6822691a") + ("lsp-docker" . "a9beb0b5c3cdb3fb1b6e34c6ad752f3b8474ae8a") + ("lsp-mode" . "e8fc0cde2f8b1ad9ccc47f928ab5a8c9002d9622") + ("lsp-origami" . "86aa06517910141c3d5054eea5f7723461fce6a6") ("lsp-treemacs" . "e66ae2196503d4e84334519e56b4388feffa5060") - ("lsp-ui" . "9d28c2ca1e79614215ea678583435d5d1189e4bc") - ("lua-mode" . "ad639c62e38a110d8d822c4f914af3e20b40ccc4") - ("magit" . "dd6ecd5fe59087b5658f0a99e1d946e7fbf2dbea") + ("lsp-ui" . "0dd39900c8ed8145d207985cb2f65cedd1ffb410") + ("lua-mode" . "d074e4134b1beae9ed4c9b512af741ca0d852ba3") + ("magit" . "fb1a3c487eabe51f2bf5f80cb9a6d9e43172f8b0") ("magit-delta" . "5fc7dbddcfacfe46d3fd876172ad02a9ab6ac616") ("magit-popup" . "d8585fa39f88956963d877b921322530257ba9f5") ("makefile-executor.el" . "d1d98eaf522a767561f6c7cbd8d2526be58b3ec5") - ("marginalia" . "1e0c156b0e7931a9aef8ca79dbab0cb690245bcd") - ("markdown-mode" . "50ac14ffe4e23224c74adf2b90a4833ccb62a416") - ("melpa" . "4d9ff9717f25fd229891746044777de8a73558c2") - ("mermaid-mode" . "105271870a872ae7a91838454b064a1153353b5f") + ("marginalia" . "e4ff0838da33bf5102ee009ff28d541f0b51c9a3") + ("markdown-mode" . "b1a862f0165b7bafe0f874738a55be1b1720dd7d") + ("melpa" . "e0b516fcfb447d0cadcf90cd748b6cedba57000e") + ("mermaid-mode" . "4cdc76e459d184fc241b607e9da131ebce9f4ce2") ("minions" . "69533c47449009a9533412db69c0eecedf5aa285") - ("mmm-mode" . "171bf6395b8a95a2d08d41fa38cc1799025d3916") + ("mmm-mode" . "96906747e862449b722b6e2c741b61871894ac3a") ("move-dup" . "5906503e0b9b832b1d5062c9cd27cf72a2ce4817") ("multiple-cursors.el" . "234806c832994cadedb42596fe235e91bbd59e8c") ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85") ("nerd-icons-completion" . "c2db8557a3c1a9588d111f8c8e91cae96ee85010") ("nerd-icons-ibuffer" . "a4f0bc7176e8f584e1bff1b64d5dd719ea91508c") - ("nerd-icons.el" . "a506b43dc241ee07c28ce815068277084afbf09c") + ("nerd-icons.el" . "cfda588dc1e865a8a121b9071f3720fd4937492b") ("nginx-mode" . "6e9d96f58eddd69f62f7fd443d9b9753e16e0e96") ("nix-mode" . "719feb7868fb567ecfe5578f6119892c771ac5e5") - ("nongnu-elpa" . "65b952d31a34ef72328b66af55d0a526917a86b1") + ("nongnu-elpa" . "e9d06c3dfe8b41a568dd1ba6fa10e284ef5380c1") ("ns-auto-titlebar" . "60273e764bf8d95abc40dd2fdc23af87ea9ee33b") ("ob-go" . "2067ed55f4c1d33a43cb3f6948609d240a8915f5") ("ob-http" . "b1428ea2a63bcb510e7382a1bf5fe82b19c104a7") @@ -166,33 +166,33 @@ ("osx-trash" . "90f0c99206022fec646206018fcd63d9d2e57325") ("ox-gfm" . "46faa67dbb3fb0cd7a76c3fe518f16e4195c22c7") ("ox-pandoc" . "0f758517f512e375825679541b5d905be40342eb") - ("package-build" . "20ca024ebe18c47f23af135b5adac2627595e9bf") + ("package-build" . "03f878a18c15432d084402e6ca5309c3ba51c78e") ("package-lint" . "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317") ("pfuture" . "19b53aebbc0f2da31de6326c495038901bffb73c") ("phi-search" . "c34f5800968922d1f9e7b10092b8705d6640ad18") - ("php-mode" . "38fd6ec205a02ccad6b3006afef0988e380adfa6") + ("php-mode" . "c0ff815afafc4de661addfee884c357c6fb42f1d") ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61") ("plantuml-mode" . "ea45a13707abd2a70df183f1aec6447197fc9ccc") - ("popup-el" . "707bb336c6eb25743f1516b6a2165b40659a9d02") + ("popup-el" . "2868885b2ba64fd469f0aa10a734ceeaf49a1baa") ("posframe" . "017deece88360c7297265680d78a0bb316470716") ("powerline" . "c35c35bdf5ce2d992882c1f06f0f078058870d4a") ("prettier-emacs" . "e9b73e81d3e1642aec682195f127a42dfb0b5774") - ("projectile" . "971cd5c4f25ff1f84ab7e8337ffc7f89f67a1b52") - ("protobuf" . "5e03386555544e39c21236dca0097123edec8769") - ("rainbow-mode" . "8e96388fb4d616a9dde23e712bad0d9cd048fbf0") + ("projectile" . "9446ea92d28462aeb37846a8be0a0c97a7bc0cee") + ("protobuf" . "c9a8b46fd0613049e9bd565caa3a94ad0acc6ed4") + ("rainbow-mode" . "41f4af40964cdb9d0cc3552eb450540fdc820455") ("recursive-narrow" . "5e3e2067d5a148d7e64e64e0355d3b6860e4c259") ("refine" . "d72fa50910b86217a35bb1b7e56adea206052021") ("resize-window" . "72018aa4d2401b60120588199d4cedd0dc1fbcfb") ("restart-emacs" . "1607da2bc657fe05ae01f7fdf26f716eafead02c") - ("restclient.el" . "0ba72816f92f3d5906cdf76f418fd0a3ee72809b") + ("restclient.el" . "e2a2b13482d72634f8e49864cd9e5c907a5fe137") ("rinari" . "9b3110f4043bc4f07d83e5ada26d64f90ef68aed") ("rjsx-mode" . "b697fe4d92cc84fa99a7bcb476f815935ea0d919") - ("rspec-mode" . "3f039ae3fda9e52433a8c31d4b6c78c89e559906") + ("rspec-mode" . "29df3d081c6a1cbdf840cd13d45ea1c100c5bbaa") ("rubocop-emacs" . "f5fd18aa810c3d3269188cbbd731ddc09006f8f5") ("rubocopfmt.el" . "1c6f4f1da755c9e60eb475eb9530320726904341") ("ruby-refactor" . "e6b7125878a08518bffec6942df0c606f748e9ee") ("ruby-tools.el" . "6b97066b58a4f82eb2ecea6434a0a7e981aa4c18") - ("rust-mode" . "601824cf552d09db62f0cef42c00dc85bd728b04") + ("rust-mode" . "9c26dc1195ec05309ee15c014631fb9abd6cf5d2") ("rust-playground" . "5a117781dcb66065bea7830dd73618008fc34949") ("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d") ("sass-mode" . "247a0d4b509f10b28e4687cd8763492bca03599b") @@ -202,44 +202,44 @@ ("shift-number.el" . "cd099a5582fc996b800ac7607f6c38a004ce9740") ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41") ("smart-shift" . "a26ab2b240137e62ec4bce1698ed9c5f7b6d13ae") - ("smartparens" . "79a338db115f441cd47bb91e6f75816c5e78a772") - ("spinner" . "634529bb3173e09b37499f636de70abf29d9fa8a") - ("sqlformat" . "c668e7f8b0d967066003855971645159748cc857") + ("smartparens" . "0778a8a84064cf2bc3a9857bd0e7a4619cc1e5c3") + ("spinner" . "67681b8f1580a7cd7a1aa49d78eaa30d11f7c178") + ("sqlformat" . "6031df714a0cb2c479f26dbe31eecff0bf4d565e") ("ssass-mode" . "96f557887ad97a0066a60c54f92b7234b8407016") ("ssh-config-mode-el" . "d560a0876a93ad4130baf33dae1b9405ad37a405") - ("straight.el" . "325f2cad8b56c543270a6537e9c891c4700cc0b7") + ("straight.el" . "b3760f5829dba37e855add7323304561eb57a3d4") ("string-edit.el" . "87936d816ae24184dd83688136531b6b6f1943fe") ("string-inflection" . "50ad54970b3cc79b6b83979bde9889ad9a9e1a9c") - ("symbol-overlay" . "a783d7b5d8dee5ba9f5e7c00a834fbd6d645081b") - ("tab-bar-notch" . "cf57393a1b3a05e7352e8c00aaafd27b98de14d4") - ("tablist" . "5f7b71a92bfb25418d7da86ad9c45f14b149496f") + ("symbol-overlay" . "029c6c3b88d12afd3da8512630b2a439d7eefc0b") + ("tab-bar-notch" . "c94d9ffe00de55a805d89af78126c83c623da049") + ("tablist" . "fcd37147121fabdf003a70279cf86fbe08cfac6f") ("terraform-doc" . "8a6ffd5ac133ced5afd07b9d963272e4208f8b1e") - ("terraform-mode" . "25a22a66f81e35c75f2fdaaab89aad7f9940fe06") - ("themes" . "e4f0b006a516a35f53df2dce2ec116876c5cd7f9") - ("transient" . "323d6b6c84e6ae55e578efa1efb6bb4d42a69cac") - ("tree-sitter-langs" . "944a734b7c3a5922a7e9a2009a9165e2dc195b18") - ("treemacs" . "92e173b3daac5e3f03fa7a63475f1d692e0c1958") + ("terraform-mode" . "e8b57df8c2a3d3171f3768f60eb84067f553289c") + ("themes" . "4aee1f5a0e54552669f747aa7c25e6027e73d76d") + ("transient" . "609dabfdac8a4a08c1e88bea9bf6cd98934ef8d1") + ("tree-sitter-langs" . "3a3ad0527d5f8c7768678878eb5cfe399bedf703") + ("treemacs" . "a1e855bce6c112d57994c991bc50775b6922f73e") ("treemacs-nerd-icons" . "9876cb478145a0ec4e36f64ff6583f3de7126216") ("treepy.el" . "75fe3ec37e6f9b2bdfd6d0584efd984d0c00a43e") ("uuidgen-el" . "7b728c1d92e196c3acf87a004949335cfc18eab3") - ("vertico" . "d1dd2f74dbcb0817c70e7211fc438b70648a3ee1") + ("vertico" . "0115a6e01d143e5b6ce00a6ce8eb9c8a309e4067") ("vmd-mode" . "b2bdf2ab54f8fc37780e6b473e4ad69c0e9ff4a6") ("vue-html-mode" . "1514939804bad558584feeb6298b38d22eadf64e") ("vue-mode" . "031edd1f97db6e7d8d6c295c0e6d58dd128b9e71") - ("vundo" . "5e917b35a942c7e18044ba8ebddbe98f8e85d818") - ("web-mode" . "57856ba64b9382811b35df0d9ab0a24aede0c1f0") - ("wfnames" . "4447417c58b063df1fca1ba4bec9cb650c7beb60") - ("with-editor" . "a4853781835346aabf083d2d9cb87f656d01ccac") - ("x509-mode" . "3830cbfdadab4cd68e6f0b6a3a7a4931be8328ea") + ("vundo" . "162ba093152d390bc4eacc384980d7b49bba50b0") + ("web-mode" . "848fce94de202541cd3fcd35e9c9d22783e9e828") + ("wfnames" . "19b452fb698a5ba3b0f1d6e7d69a5e19af2c83e7") + ("with-editor" . "fcd186d1e684c2dca6497c89af77b27b2b036c11") + ("x509-mode" . "57395a72087875108245f384acd9327db8b59abb") ("xterm-color" . "2ad407c651e90fff2ea85d17bf074cee2c022912") ("xwwp" . "f67e070a6e1b233e60274deb717274b000923231") ("yaml-imenu.el" . "c1fbba8b03a7bef4fc2b87404914fa9c6eb67b55") - ("yaml-mode" . "13728b4b1b1bd33d3a754236a0f23e4c76d6ba91") - ("yaml.el" . "ee86566af1ed4975531ab3aa4eb4dba770c227f6") - ("yank-indent" . "78442881436888c0d94396ee521adf154f252c8b") + ("yaml-mode" . "23395dfcf004c952850691b70e63f97f169596e8") + ("yaml.el" . "fe08b8f5307af1e7b876ece64b7303213f04b63c") + ("yank-indent" . "8fe8de468f97051bf353d27f586b4f188351f558") ("yari.el" . "a2cb9656ee5dfe1fc2ee3854f3079a1c8e85dbe9") - ("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6") - ("yasnippet-snippets" . "bec49fa129ae8c0104ba150f9b8352a39c54dbd6") + ("yasnippet" . "52a1c5031912243c791c55e0fe345d04f219b507") + ("yasnippet-snippets" . "063f54cea33f59defe9123549bf55ca342457a1c") ("zone-nyan" . "38b6e9f1f5871e9166b00a1db44680caa56773be") - ("zoom-window" . "a1a5834208befba65c5514af0da57cc7cbabeb96")) + ("zoom-window" . "9ce43b1b32dc9987e70ee778b5ca90984e2d79d1")) :gamma diff --git a/vendor/lsp-bufls/lsp-bufls.el b/vendor/lsp-bufls/lsp-bufls.el deleted file mode 100644 index c0e9a9a..0000000 --- a/vendor/lsp-bufls/lsp-bufls.el +++ /dev/null @@ -1,66 +0,0 @@ -;;; lsp-bufls.el --- bufls-langserver Client settings -*- lexical-binding: t; -*- - -;; Copyright (C) 2023 Jim Myhrberg - -;; Author: Jim Myhrberg -;; Keywords: - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . - -;;; Commentary: - -;; lsp-bufls client - -;;; Code: - -(require 'lsp-mode) -(require 'lsp-go) - -(defgroup lsp-bufls nil - "Configuration options for lsp-bufls." - :group 'lsp-mode - :link '(url-lint "https://github.com/bufbuild/buf-language-server")) - -(defcustom lsp-bufls-args nil - "Arguments to pass to bufls serve." - :type '(repeat string) - :group 'lsp-bufls) - -(defcustom lsp-bufls-path "bufls" - "Command to run bufls." - :type 'string - :group 'lsp-bufls) - -(defun lsp-bufls-server--stdio-command () - "Return the command and args to start bufls-langserver." - (let ((args (list lsp-bufls-path "serve"))) - (when (and (listp lsp-bufls-args) - (length> lsp-bufls-args 0)) - (setq args (append args lsp-bufls-args))) - args)) - -(add-to-list 'lsp-language-id-configuration '(protobuf-mode . "protobuf")) - -(lsp-register-client - (make-lsp-client :new-connection (lsp-stdio-connection - #'lsp-bufls-server--stdio-command) - :activation-fn (lsp-activate-on "protobuf") - :language-id "protobuf" - :priority 0 - :server-id 'bufls)) - -(lsp-consistency-check lsp-bufls) - -(provide 'lsp-bufls) -;;; lsp-bufls.el ends here diff --git a/vendor/lsp-golangci-lint/lsp-golangci-lint.el b/vendor/lsp-golangci-lint/lsp-golangci-lint.el deleted file mode 100644 index 0edceb9..0000000 --- a/vendor/lsp-golangci-lint/lsp-golangci-lint.el +++ /dev/null @@ -1,163 +0,0 @@ -;;; lsp-golangci-lint.el --- golangci-lint-langserver Client settings -*- lexical-binding: t; -*- - -;; Copyright (C) 2023 Jim Myhrberg - -;; Author: Jim Myhrberg -;; Keywords: - -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see . - -;;; Commentary: - -;; lsp-golangci-lint client - -;;; Code: - -(require 'lsp-mode) -(require 'lsp-go) -(require 'cl-lib) - -(defgroup lsp-golangci-lint nil - "Configuration options for lsp-golangci-lint." - :group 'lsp-mode - :link '(url-lint "https://github.com/nametake/golangci-lint-langserver")) - -(defcustom lsp-golangci-lint-server-path "golangci-lint-langserver" - "Command to run golangci-lint-langserver." - :type 'string - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-server-debug nil - "Whether to run golangci-lint-langserver in debug mode or not." - :type 'boolean - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-server-args nil - "Arguments to pass to golangci-lint-langserver." - :type '(repeat string) - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-path "golangci-lint" - "Command to run golangci-lint." - :type 'string - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-allow-parallel-runners t - "If not nil, pass --allow-parallel-runners flag to golangci-lint run." - :type 'boolean - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-build-tags nil - "If non-empty list, pass as --build-tags flag value to golangci-lint run." - :type '(repeat string) - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-fast nil - "If not nil, pass --fast flag to golangci-lint run." - :type 'boolean - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-enable-all nil - "If not nil, pass --enable-all flag to golangci-lint run." - :type 'boolean - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-enable nil - "If non-empty list, pass as --enable flag value to golangci-lint run." - :type '(repeat string) - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-disable-all nil - "If not nil, pass --disable-all to golangci-lint run." - :type 'boolean - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-disable nil - "If non-empty list, pass as --disable flag value to golangci-lint run." - :type '(repeat string) - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-config nil - "If set, pass value as --config flag to golangci-lint run." - :type 'string - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-no-config nil - "If not nil, pass --no-config flag to golangci-lint run." - :type 'boolean - :group 'lsp-golangci-lint) - -(defcustom lsp-golangci-lint-run-args nil - "Arguments to pass to golangci-lint run command." - :type '(repeat string) - :group 'lsp-golangci-lint) - -(defun lsp-golangci-lint-server--stdio-command () - "Return the command and args to start golangci-lint-langserver." - (let ((args (list lsp-golangci-lint-server-path))) - (when (and (listp lsp-golangci-lint-server-args) - (length> lsp-golangci-lint-server-args 0)) - (setq args (append args lsp-golangci-lint-server-args))) - (when lsp-golangci-lint-server-debug - (setq args (append args '("-debug")))) - args)) - -(defun lsp-golangci-lint--run-args () - "Return the arguments to pass to golangci-lint run command." - (let* ((tags (string-join lsp-golangci-lint-build-tags " ")) - (enable (string-join lsp-golangci-lint-enable ",")) - (disable (string-join lsp-golangci-lint-disable ",")) - (args (cl-loop for (condition flag value) in - `((,lsp-golangci-lint-fast "--fast" nil) - (,(not (string-empty-p tags)) "--build-tags" ,tags) - (,lsp-golangci-lint-enable-all "--enable-all" nil) - (,lsp-golangci-lint-disable-all "--disable-all" nil) - (,(not (string-empty-p enable)) "--enable" ,enable) - (,(not (string-empty-p disable)) "--disable" ,disable) - (,lsp-golangci-lint-allow-parallel-runners - "--allow-parallel-runners" nil) - (,(and (stringp lsp-golangci-lint-config) - (not (string-empty-p lsp-golangci-lint-config))) - "--config" lsp-golangci-lint-config)) - when condition - append (if value (list flag value) (list flag))))) - (when (and (listp lsp-golangci-lint-run-args) - (length> lsp-golangci-lint-run-args 0)) - (setq args (append args lsp-golangci-lint-run-args))) - args)) - -(defun lsp-golangci-lint--get-initialization-options () - "Return initialization options for golangci-lint-langserver." - (let ((opts (make-hash-table :test 'equal)) - (command (vconcat `(,lsp-golangci-lint-path) - ["run" "--out-format=json" "--issues-exit-code=1"] - (lsp-golangci-lint--run-args)))) - (puthash "command" command opts) - opts)) - -(lsp-register-client - (make-lsp-client :new-connection (lsp-stdio-connection - #'lsp-golangci-lint-server--stdio-command) - :activation-fn (lsp-activate-on "go") - :language-id "go" - :priority 0 - :server-id 'golangci-lint - :add-on? t - :library-folders-fn #'lsp-go--library-default-directories - :initialization-options #'lsp-golangci-lint--get-initialization-options)) - -(lsp-consistency-check lsp-golangci-lint) - -(provide 'lsp-golangci-lint) -;;; lsp-golangci-lint.el ends here