ソースを参照

fix(neovim): migrate to `ruff server` from `ruff-lsp`

Joe 1 年間 前
コミット
12f0461499

+ 2 - 2
.config/nvim/custom/proj-conf/lua/proj-conf/lsp/init.lua

@@ -102,8 +102,8 @@ return {
     default_marksman_config = function()
         lspconfig.marksman.setup({ capabilities = capabilities })
     end,
-    default_ruff_lsp_config = function()
-        lspconfig.ruff_lsp.setup({ capabilities = capabilities })
+    default_ruff_config = function()
+        lspconfig.ruff.setup({ capabilities = capabilities })
     end,
     default_rust_analyzer_config = function()
         lspconfig.rust_analyzer.setup({ capabilities = capabilities })

+ 2 - 2
.config/nvim/custom/proj-conf/lua/proj-conf/projects/ruff_pyright.lua

@@ -11,11 +11,11 @@ return {
     ruff_pyright_format = function()
         formatter.enable(vim.tbl_deep_extend("force", formatter.default(), {
             python = false,
-            ruff_lsp = true,
+            ruff = true,
         }))
     end,
     ruff_pyright_lsp = function()
-        lspconfig.ruff_lsp.setup({
+        lspconfig.ruff.setup({
             capabilities = capabilities,
             on_attach = function(client, _)
                 client.server_capabilities.hoverProvider = false

+ 2 - 2
.config/nvim/custom/save-formatter/lua/save-formatter/init.lua

@@ -2,7 +2,7 @@ local commands = {
     prettier =
     [[!prettier --write --ignore-path $XDG_CONFIG_HOME/prettier/ignore --config $XDG_CONFIG_HOME/prettier/config %:p]],
     deno = [[!deno fmt %:p]],
-    black = [[!black %:p && isort %:p]],
+    ruff = [[!ruff format %:p]],
 }
 
 local default = {
@@ -12,7 +12,7 @@ local default = {
     css = commands.prettier,
     markdown = commands.prettier,
     denols = commands.deno,
-    python = commands.black,
+    python = commands.ruff,
     lua_ls = true,
 }
 local enabled = {}

+ 1 - 1
.config/nvim/lua/plugins/lsp.lua

@@ -12,7 +12,7 @@ return {
                     "arduino_language_server", "basedpyright", "bashls", "clangd",
                     "cssls", "denols", "gopls", "html", "jsonls",
                     "kotlin_language_server", "lemminx", "lua_ls", "marksman",
-                    "ruff_lsp", "rust_analyzer", "sqlls", "taplo", "terraformls",
+                    "ruff", "rust_analyzer", "sqlls", "taplo", "terraformls",
                     "tsserver", "yamlls"
                 }
             })