Remove null-ls
This commit is contained in:
		@ -21,13 +21,8 @@
 | 
			
		||||
  (bind! :n :<leader>rn vim.lsp.buf.rename buf)
 | 
			
		||||
  (bind! :n :<leader>cn vim.lsp.buf.code_action buf)
 | 
			
		||||
  ; (bind! :n :gr vim.lsp.buf.references buf)
 | 
			
		||||
  (bind! [ :n :v ] :<leader>o
 | 
			
		||||
         #(vim.lsp.buf.format { :filter
 | 
			
		||||
                                ;; use null-ls for formatting
 | 
			
		||||
                                (fn [client] (or
 | 
			
		||||
                                               (= client.name :null-ls)
 | 
			
		||||
                                               (= client.name :rust_analyzer)))
 | 
			
		||||
                                :async true }) buf)
 | 
			
		||||
  (when (= client.name :rust_analyzer)
 | 
			
		||||
    (bind! [ :n :v ] :<leader>o #(vim.lsp.buf.format {:async true})))
 | 
			
		||||
 | 
			
		||||
  ;; Use builtin formatexpr
 | 
			
		||||
  (vim.api.nvim_buf_set_option buf :formatexpr "")
 | 
			
		||||
@ -111,38 +106,4 @@
 | 
			
		||||
                         :diagnostics {
 | 
			
		||||
                           :globals [ "vim" ] }}})))
 | 
			
		||||
 | 
			
		||||
(fn setup-null-ls []
 | 
			
		||||
  (let [builtins (. (require :null-ls) :builtins)]
 | 
			
		||||
    (setup! :null-ls
 | 
			
		||||
            :on_attach (fn [client buf]
 | 
			
		||||
                         (bind! [ :n :v ]
 | 
			
		||||
                                :<leader>o
 | 
			
		||||
                                #(vim.lsp.buf.format
 | 
			
		||||
                                   { :filter
 | 
			
		||||
                                   ;; use null-ls for formatting
 | 
			
		||||
                                   (fn [client]
 | 
			
		||||
                                     (or
 | 
			
		||||
                                       (= client.name :null-ls)
 | 
			
		||||
                                       (= client.name :rust_analyzer)))
 | 
			
		||||
                                   :async true }) buf)
 | 
			
		||||
                         (vim.api.nvim_buf_set_option buf :formatexpr ""))
 | 
			
		||||
            :sources [
 | 
			
		||||
                      builtins.formatting.astyle
 | 
			
		||||
                      builtins.formatting.prettier
 | 
			
		||||
                      builtins.formatting.yapf
 | 
			
		||||
                      builtins.formatting.fnlfmt
 | 
			
		||||
                      builtins.formatting.shfmt
 | 
			
		||||
                      builtins.formatting.cmake_format
 | 
			
		||||
                      builtins.formatting.latexindent
 | 
			
		||||
                      builtins.formatting.stylua
 | 
			
		||||
                      builtins.code_actions.shellcheck
 | 
			
		||||
                      (builtins.completion.spell.with { :filetypes [ :text
 | 
			
		||||
                                                                     :markdown
 | 
			
		||||
                                                                     :tex ]})
 | 
			
		||||
                      builtins.diagnostics.cmake_lint
 | 
			
		||||
                      ;;builtins.diagnostics.codespell
 | 
			
		||||
                      ;;builtins.diagnostics.shellcheck
 | 
			
		||||
                      (builtins.diagnostics.glslc.with
 | 
			
		||||
                        { :extra_args [ "--target-env=opengl" ]})])))
 | 
			
		||||
 | 
			
		||||
{: configure : on-attach : get-data-dir : setup-null-ls }
 | 
			
		||||
{: configure : on-attach : get-data-dir }
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user