From 3550d7c06a5bf3c5b4134caab8d70cafaf4cc490 Mon Sep 17 00:00:00 2001
From: christianchiarulli <chrisatmachine@gmail.com>
Date: Thu, 15 Jul 2021 20:49:33 -0400
Subject: update

---
 lua/core/galaxyline.lua |  6 +++---
 lua/default-config.lua  |  5 -----
 lua/lsp/init.lua        | 39 ++++++++++++++++++++++++++++++++-------
 3 files changed, 35 insertions(+), 15 deletions(-)

(limited to 'lua')

diff --git a/lua/core/galaxyline.lua b/lua/core/galaxyline.lua
index 281202a8..2cb175f4 100644
--- a/lua/core/galaxyline.lua
+++ b/lua/core/galaxyline.lua
@@ -281,7 +281,7 @@ table.insert(gls.right, {
     condition = condition.hide_in_width,
     separator = " ",
     separator_highlight = { "NONE", colors.alt_bg },
-    highlight = { colors.grey, colors.alt_bg },
+    highlight = { colors.alt_bg, colors.alt_bg },
   },
 })
 
@@ -311,7 +311,7 @@ table.insert(gls.short_line_left, {
     provider = "FileTypeName",
     separator = " ",
     separator_highlight = { "NONE", colors.alt_bg },
-    highlight = { colors.grey, colors.alt_bg },
+    highlight = { colors.alt_bg, colors.alt_bg },
   },
 })
 
@@ -319,7 +319,7 @@ table.insert(gls.short_line_left, {
   SFileName = {
     provider = "SFileName",
     condition = condition.buffer_not_empty,
-    highlight = { colors.grey, colors.alt_bg },
+    highlight = { colors.alt_bg, colors.alt_bg },
   },
 })
 
diff --git a/lua/default-config.lua b/lua/default-config.lua
index 43b97e35..21e6f13e 100644
--- a/lua/default-config.lua
+++ b/lua/default-config.lua
@@ -64,11 +64,6 @@ O = {
   auto_close_tree = 0,
   nvim_tree_disable_netrw = 0,
 
-  lsp = {
-    document_highlight = true,
-    popup_border = "single",
-  },
-
   database = { save_location = "~/.config/lunarvim_db", auto_execute = 1 },
 
   -- TODO: just using mappings (leader mappings)
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
index 01f82737..a91d83c8 100644
--- a/lua/lsp/init.lua
+++ b/lua/lsp/init.lua
@@ -16,15 +16,43 @@ vim.fn.sign_define(
   { texthl = "LspDiagnosticsSignInformation", text = "", numhl = "LspDiagnosticsSignInformation" }
 )
 
+-- local opts = { border = "single" }
+-- TODO revisit this
+-- local border = {
+--   { "🭽", "FloatBorder" },
+--   { "▔", "FloatBorder" },
+--   { "🭾", "FloatBorder" },
+--   { "▕", "FloatBorder" },
+--   { "🭿", "FloatBorder" },
+--   { "▁", "FloatBorder" },
+--   { "🭼", "FloatBorder" },
+--   { "▏", "FloatBorder" },
+-- }
+
+-- My font didn't like this :/
+-- vim.api.nvim_set_keymap(
+--   "n",
+--   "gl",
+--   '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({ show_header = false, border = { { "🭽", "FloatBorder" }, { "▔", "FloatBorder" }, { "🭾", "FloatBorder" }, { "▕", "FloatBorder" }, { "🭿", "FloatBorder" }, { "▁", "FloatBorder" }, { "🭼", "FloatBorder" }, { "▏", "FloatBorder" }, } })<CR>',
+--   { noremap = true, silent = true }
+-- )
+
 vim.cmd "nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>"
 vim.cmd "nnoremap <silent> gD <cmd>lua vim.lsp.buf.declaration()<CR>"
 vim.cmd "nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>"
 vim.cmd "nnoremap <silent> gi <cmd>lua vim.lsp.buf.implementation()<CR>"
+vim.api.nvim_set_keymap(
+  "n",
+  "gl",
+  '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({ show_header = false, border = "single" })<CR>',
+  { noremap = true, silent = true }
+)
+
 vim.cmd "nnoremap <silent> gp <cmd>lua require'lsp'.PeekDefinition()<CR>"
 vim.cmd "nnoremap <silent> K :lua vim.lsp.buf.hover()<CR>"
--- vim.cmd('nnoremap <silent> <C-k> <cmd>lua vim.lsp.buf.signature_help()<CR>')
 vim.cmd "nnoremap <silent> <C-p> :lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = O.lsp.popup_border}})<CR>"
 vim.cmd "nnoremap <silent> <C-n> :lua vim.lsp.diagnostic.goto_next({popup_opts = {border = O.lsp.popup_border}})<CR>"
+vim.cmd "nnoremap <silent> <tab> <cmd>lua vim.lsp.buf.signature_help()<CR>"
 -- scroll down hover doc or scroll in definition preview
 -- scroll up hover doc
 vim.cmd 'command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").toggle()'
@@ -32,12 +60,9 @@ vim.cmd 'command! -nargs=0 LspVirtualTextToggle lua require("lsp/virtual_text").
 -- Set Default Prefix.
 -- Note: You can set a prefix per lsp server in the lv-globals.lua file
 vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
-  virtual_text = {
-    prefix = "",
-    spacing = 0,
-  },
-  signs = true,
-  underline = true,
+  virtual_text = O.lsp.diagnostics.virtual_text,
+  signs = O.lsp.diagnostics.signs,
+  underline = O.lsp.document_highlight,
 })
 
 vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
-- 
cgit v1.2.3