feat(null-ls): use none-ls instead of null-ls

liubang · Oct 14, 2023 · c3b94af · c3b94af
1 parent d283702
commit c3b94af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/lua/lb/utils/util.lua b/lua/lb/utils/util.lua
@@ -318,10 +318,8 @@ end -- }}}
 -- stylua: ignore
 local lsp_names = { --{{{
   ["null-ls"]             = "NLS",
-  ["diagnostics_on_open"] = "Diagnostics",
-  ["diagnostics_on_save"] = "Diagnostics",
-  clangd                  = "C++",
-  gopls                   = "Go",
+  clangd                  = "Clangd",
+  gopls                   = "Gopls",
   rust_analyzer           = "Rust",
   lua_ls                  = "Lua",
   intelephense            = "PHP",

diff --git a/lua/plugins/lsp/init.lua b/lua/plugins/lsp/init.lua
@@ -44,16 +44,16 @@ return {
     end,
   },
   {
-    "jose-elias-alvarez/null-ls.nvim",
+    "nvimtools/none-ls.nvim",
     event = { "BufReadPre", "BufNewFile" },
     dependencies = { "mason.nvim" },
     opts = function()
       local null_ls = require "null-ls"
       local b = null_ls.builtins
       local c = require "plugins.lsp.customs"
       return c.default {
+        debug = true,
         sources = {
-          b.formatting.phpcsfixer,
           b.formatting.stylua,
           b.formatting.cmake_format,
           b.formatting.asmfmt,
@@ -92,9 +92,7 @@ return {
               "vue",
             },
           },
-          b.formatting.shfmt.with {
-            extra_args = { "-i", "2", "-ci" },
-          },
+          b.formatting.shfmt,
           b.diagnostics.shellcheck.with {
             method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
           },

diff --git a/tasks.ini b/tasks.ini
@@ -9,6 +9,7 @@
 
 # vim: set noet fenc=utf-8 sts=4 sw=4 ts=4 ft=dosini:
 [file-build]
+command=echo unsupported filetype $(VIM_FILETYPE)
 command:c/linux=gcc -std=c11 -g -Wall "$(VIM_FILEPATH)" -o "$(VIM_PATHNOEXT)"
 command:cpp/linux=g++ -std=c++17 -g -Wall -fstrict-aliasing -fsanitize=address -fno-omit-frame-pointer "$(VIM_FILEPATH)" -o "$(VIM_PATHNOEXT)" -lpthread
 command:go/linux=go build -o "$(VIM_PATHNOEXT)" "$(VIM_FILEPATH)"