From 1faef549ee25a11dece2da2da4c777042bef1b33 Mon Sep 17 00:00:00 2001
From: Rikuoh <mail@riq0h.jp>
Date: Fri, 3 Nov 2023 12:30:10 +0900
Subject: [PATCH] Migrate none-ls

---
 init.lua | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/init.lua b/init.lua
index 911b25f..2b59133 100644
--- a/init.lua
+++ b/init.lua
@@ -145,6 +145,8 @@ defaults = {lazy = true},
 {'williamboman/mason.nvim', event = 'BufRead', cmd = {'Mason', 'MasonInstall'}, },
 {'neovim/nvim-lspconfig', event = 'LspAttach'},
 {'williamboman/mason-lspconfig.nvim', event = 'LspAttach'},
+{'jay-babu/mason-null-ls.nvim', event = 'LspAttach'},
+{'nvimtools/none-ls.nvim', event = 'LspAttach'},
 {'mfussenegger/nvim-dap', event = 'LspAttach'},
 {'rcarriga/nvim-dap-ui', event = 'LspAttach'},
 {'suketa/nvim-dap-ruby', config = true, event = 'LspAttach'},
@@ -183,7 +185,6 @@ defaults = {lazy = true},
 {'monaqa/dial.nvim', event = 'VeryLazy'},
 {'tpope/vim-repeat', event = 'VeryLazy'},
 {'nvim-zh/colorful-winsep.nvim', config = true, event = 'WinNew'},
-{'prettier/vim-prettier', event = 'BufRead'},
 {'vim-jp/vimdoc-ja', ft = 'help'},
 
 --non-lazy
@@ -338,6 +339,9 @@ local on_attach = function(client, bufnr)
 vim.lsp.handlers['textDocument/publishDiagnostics'] = vim.lsp.with(
 vim.lsp.diagnostic.on_publish_diagnostics, { virtual_text = false })
 require('mason').setup()
+require("mason-null-ls").setup({
+    handlers = {},
+})
 require('mason-lspconfig').setup()
 require('mason-lspconfig').setup_handlers {
   function(server_name)
@@ -349,6 +353,26 @@ require('mason-lspconfig').setup_handlers {
 }
 
 
+--none-ls
+local status, null_ls = pcall(require, 'null-ls')
+if (not status) then return end
+
+null_ls.setup({
+    sources = {
+        null_ls.builtins.diagnostics.eslint.with({
+        prefer_local = 'node_modules/.bin',
+    }),
+        null_ls.builtins.formatting.prettierd,
+        null_ls.builtins.diagnostics.rubocop,
+        null_ls.builtins.formatting.rubocop,
+    },
+    debug = false,
+})
+
+vim.keymap.set('n', '<leader>p', function() vim.lsp.buf.format { async = true } end)
+vim.keymap.set('v', '<leader>p', function() vim.lsp.buf.format { async = true } end)
+
+
 --DAP
 local function map(mode, lhs, rhs, opts)
 	local options = {noremap = true}
@@ -441,6 +465,7 @@ require('jaq-nvim').setup{
       go       = 'go run %',
       sh       = 'sh %',
       ruby     = 'ruby %',
+      java     = 'java %',
     }
   },
 
@@ -581,10 +606,6 @@ require('dressing').setup({
 })
 
 
---vim-prettier
-vim.keymap.set('v', '<Leader>p', '<C-u>:PrettierFragment<CR>')
-
-
 --modes
 require('modes').setup({
   colors = {