From 341cd9e6d6cbb5dfff5ddb7d4d1ccf2b8132d859 Mon Sep 17 00:00:00 2001
From: sentriz <senan@senan.xyz>
Date: Thu, 19 Nov 2020 19:15:52 +0000
Subject: [PATCH] vim: upgrade to #12655, delete diagnostic, delete completion

related https://github.com/neovim/neovim/pull/12655
related https://github.com/nvim-lua/diagnostic-nvim/issues/73
---
 .gitmodules                                   |  6 --
 conf_common/.config/nvim/conf_lang_server.vim | 56 +++++++++----------
 conf_common/.config/nvim/conf_plugins.vim     | 10 ----
 .../nvim/site/pack/meta/opt/neovim/nvim-lsp   |  2 +-
 .../pack/meta/opt/nvim-lua/completion-nvim    |  1 -
 .../pack/meta/opt/nvim-lua/diagnostic-nvim    |  1 -
 6 files changed, 26 insertions(+), 50 deletions(-)
 delete mode 160000 conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/completion-nvim
 delete mode 160000 conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/diagnostic-nvim

diff --git a/.gitmodules b/.gitmodules
index d00b7154..83877357 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,12 +25,6 @@
 [submodule "conf_common/.local/share/nvim/site/pack/meta/opt/neovim/nvim-lsp"]
 	path = conf_common/.local/share/nvim/site/pack/meta/opt/neovim/nvim-lsp
 	url = https://github.com/neovim/nvim-lsp
-[submodule "conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/completion-nvim"]
-	path = conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/completion-nvim
-	url = https://github.com/nvim-lua/completion-nvim
-[submodule "conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/diagnostic-nvim"]
-	path = conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/diagnostic-nvim
-	url = https://github.com/nvim-lua/diagnostic-nvim
 [submodule "conf_common/.local/share/nvim/site/pack/meta/opt/rhysd/committia.vim"]
 	path = conf_common/.local/share/nvim/site/pack/meta/opt/rhysd/committia.vim
 	url = https://github.com/rhysd/committia.vim
diff --git a/conf_common/.config/nvim/conf_lang_server.vim b/conf_common/.config/nvim/conf_lang_server.vim
index acc472d4..3a8e47e2 100644
--- a/conf_common/.config/nvim/conf_lang_server.vim
+++ b/conf_common/.config/nvim/conf_lang_server.vim
@@ -8,11 +8,17 @@
 " vue           npm install -g typescript vls
 
 lua <<EOF
-local lsp        = require "nvim_lsp"
-local configs    = require "nvim_lsp/configs"
-local util       = require "nvim_lsp/util"
-local diagnostic = require "diagnostic"
-local completion = require "completion"
+vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
+    vim.lsp.diagnostic.on_publish_diagnostics, {
+        virtual_text = false,
+        signs = true,
+        update_in_insert = false,
+    }
+)
+
+local lsp        = require "lspconfig"
+local configs    = require "lspconfig/configs"
+local util       = require "lspconfig/util"
 
 local sync_timeout = 150
 
@@ -206,33 +212,22 @@ configs.custom_java = {
     }
 }
 
-local configs = {
-    lsp.custom_bash,
-    lsp.custom_clang,
-    lsp.custom_docker,
-    lsp.custom_go,
-    lsp.custom_python,
-    lsp.custom_typescript,
-    lsp.custom_vue,
-    lsp.custom_dart,
-    lsp.custom_java,
-}
-
-for i, config in pairs(configs) do
-    config.setup({
-        on_attach = function(client, buffer)
-            diagnostic.on_attach(client, buffer)
-            completion.on_attach(client, buffer)
-        end
-    })
-end
+lsp.custom_bash.setup({})
+lsp.custom_clang.setup({})
+lsp.custom_docker.setup({})
+lsp.custom_go.setup({})
+lsp.custom_python.setup({})
+lsp.custom_typescript.setup({})
+lsp.custom_vue.setup({})
+lsp.custom_dart.setup({})
+lsp.custom_java.setup({})
 EOF
 
 " lsp mappings
 nnoremap <silent> gd    <cmd>lua vim.lsp.buf.declaration()<cr>
 nnoremap <silent> <c-]> <cmd>lua vim.lsp.buf.definition()<cr>
 nnoremap <silent> K     <cmd>lua vim.lsp.buf.hover()<cr>
-nnoremap <silent> J     <cmd>lua vim.lsp.util.show_line_diagnostics()<cr>
+nnoremap <silent> J     <cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<cr>
 nnoremap <silent> gD    <cmd>lua vim.lsp.buf.implementation()<cr>
 nnoremap <silent> 1gD   <cmd>lua vim.lsp.buf.type_definition()<cr>
 nnoremap <silent> gr    <cmd>lua vim.lsp.buf.references()<cr>
@@ -256,8 +251,7 @@ autocmd Filetype dart            autocmd BufWritePre * silent! lua document_form
 autocmd Filetype go              autocmd BufWritePre * silent! lua document_format_and_organise_sync()
 autocmd Filetype python          autocmd BufWritePre * silent! lua document_format_and_organise_sync()
 
-" the bar on the left symbols
-call sign_define('LspDiagnosticsErrorSign',       {'text': 'ee', 'texthl': 'LspDiagnosticsError'})
-call sign_define('LspDiagnosticsWarningSign',     {'text': 'ww', 'texthl': 'LspDiagnosticsWarning'})
-call sign_define('LspDiagnosticsInformationSign', {'text': 'ii', 'texthl': 'LspDiagnosticsInformation'})
-call sign_define('LspDiagnosticsHintSign',        {'text': 'hh', 'texthl': 'LspDiagnosticsHint'})
+sign define LspDiagnosticsSignError       text=ee texthl=LspDiagnosticsSignError
+sign define LspDiagnosticsSignWarning     text=ww texthl=LspDiagnosticsSignWarning
+sign define LspDiagnosticsSignInformation text=ii texthl=LspDiagnosticsSignInformation
+sign define LspDiagnosticsSignHint        text=hh texthl=LspDiagnosticsSignHint
diff --git a/conf_common/.config/nvim/conf_plugins.vim b/conf_common/.config/nvim/conf_plugins.vim
index 44cdec86..6f3b88f3 100644
--- a/conf_common/.config/nvim/conf_plugins.vim
+++ b/conf_common/.config/nvim/conf_plugins.vim
@@ -5,14 +5,6 @@ let g:SpiffyFoldtext_format = "%c{ } ... }%f{ }"
 let g:tmux_navigator_no_mappings = 1
 let g:tmux_navigator_save_on_switch = 1
 
-let g:diagnostic_enable_virtual_text = 0
-let g:diagnostic_insert_delay = 1
-let g:diagnostic_show_sign = 1
-
-let g:completion_enable_auto_popup = 1
-let g:completion_enable_auto_paren = 1
-let g:completion_enable_auto_hover = 0
-
 let g:monotone_color = [10, 3, 100]
 let g:monotone_secondary_hue_offset = 0
 
@@ -25,8 +17,6 @@ packadd! christoomey/vim-tmux-navigator
 packadd! inkarkat/SyntaxAttr.vim
 packadd! machakann/vim-highlightedyank
 packadd! neovim/nvim-lsp
-packadd! nvim-lua/completion-nvim
-packadd! nvim-lua/diagnostic-nvim
 packadd! nvim-lua/popup.nvim
 packadd! nvim-lua/plenary.nvim
 packadd! nvim-lua/telescope.nvim
diff --git a/conf_common/.local/share/nvim/site/pack/meta/opt/neovim/nvim-lsp b/conf_common/.local/share/nvim/site/pack/meta/opt/neovim/nvim-lsp
index 60133c47..4f19567f 160000
--- a/conf_common/.local/share/nvim/site/pack/meta/opt/neovim/nvim-lsp
+++ b/conf_common/.local/share/nvim/site/pack/meta/opt/neovim/nvim-lsp
@@ -1 +1 @@
-Subproject commit 60133c47e0fd82556d7ca092546ebfa8d047466e
+Subproject commit 4f19567fb76438d39ed196ae5b4e06b749e75e16
diff --git a/conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/completion-nvim b/conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/completion-nvim
deleted file mode 160000
index 857fb1b1..00000000
--- a/conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/completion-nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 857fb1b14644cf90aa0dceed2b3ae1e241f078d9
diff --git a/conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/diagnostic-nvim b/conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/diagnostic-nvim
deleted file mode 160000
index bef1c614..00000000
--- a/conf_common/.local/share/nvim/site/pack/meta/opt/nvim-lua/diagnostic-nvim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bef1c6140563cb6416081b2517ae9953cd4e05ab