vim: use new vim.ui funcs (neovim 0.6.0)

4 files changed, 41 insertions, 28 deletions

diff --git a/.vim/lua/colors.lua b/.vim/lua/colors.lua
index 1f1cb1b..4040930 100644
--- a/.vim/lua/colors.lua
+++ b/.vim/lua/colors.lua
@@ -168,25 +168,29 @@ return lush(function()
     -- }}}
 
     -- LSP {{{
-    LspDiagnosticsError                  { Error }, -- used for "Error" diagnostics
-    LspDiagnosticsFloatingError          { LspDiagnosticsError },
-    LspDiagnosticsVirtualTextError       { fg = LspDiagnosticsError.fg.darken(40) },
-    LspDiagnosticsSignError              { LspDiagnosticsError },
+    DiagnosticError                      { Error },
+    LspDiagnosticsError                  { DiagnosticError },
+    LspDiagnosticsFloatingError          { DiagnosticError },
+    LspDiagnosticsVirtualTextError       { fg = DiagnosticError.fg.darken(40) },
+    LspDiagnosticsSignError              { DiagnosticError },
 
-    LspDiagnosticsWarning                { WarningMsg }, -- used for "Warning" diagnostics
-    LspDiagnosticsFloatingWarning        { LspDiagnosticsWarning },
-    LspDiagnosticsVirtualTextWarning     { fg = LspDiagnosticsWarning.fg.darken(60) },
-    LspDiagnosticsSignWarning            { LspDiagnosticsWarning },
+    DiagnosticWarn                       { WarningMsg },
+    LspDiagnosticsWarning                { DiagnosticWarn },
+    LspDiagnosticsFloatingWarning        { DiagnosticWarn },
+    LspDiagnosticsVirtualTextWarning     { fg = DiagnosticWarn.fg.darken(60) },
+    LspDiagnosticsSignWarning            { DiagnosticWarn },
 
-    LspDiagnosticsInformation            { MoreMsg }, -- used for "Information" diagnostics
-    LspDiagnosticsFloatingInformation    { LspDiagnosticsInformation },
-    LspDiagnosticsVirtualTextInformation { fg = LspDiagnosticsInformation.fg.darken(20) },
-    LspDiagnosticsSignInformation        { LspDiagnosticsInformation },
+    DiagnosticInfo                       { MoreMsg },
+    LspDiagnosticsInformation            { DiagnosticInfo },
+    LspDiagnosticsFloatingInformation    { DiagnosticInfo },
+    LspDiagnosticsVirtualTextInformation { fg = DiagnosticInfo.fg.darken(20) },
+    LspDiagnosticsSignInformation        { DiagnosticInfo },
 
-    LspDiagnosticsHint                   { fg = hsl(p.normal.white) }, -- used for "Hint" diagnostics
-    LspDiagnosticsFloatingHint           { LspDiagnosticsHint },
-    LspDiagnosticsVirtualTextHint        { fg = LspDiagnosticsHint.fg.darken(40) },
-    LspDiagnosticsSignHint               { LspDiagnosticsHint },
+    DiagnosticHint                       { Normal },
+    LspDiagnosticsHint                   { DiagnosticHint },
+    LspDiagnosticsFloatingHint           { DiagnosticHint },
+    LspDiagnosticsVirtualTextHint        { fg = DiagnosticHint.fg.darken(40) },
+    LspDiagnosticsSignHint               { DiagnosticHint },
 
     -- LspDiagnosticsUnderlineError {},
     -- LspDiagnosticsUnderlineWarning {},
@@ -316,7 +320,7 @@ return lush(function()
     StatusLineCommand { StatusLine },
     StatusLineVisual { Visual },
     StatusLineReplace { fg = hsl(p.bright.white), bg = hsl(p.bright.red) },
-    StatusLineJobs { LspDiagnosticsHint },
+    StatusLineJobs { DiagnosticHint },
     StatusLineDiagnostics { StatusLine },
     StatusLineLightbulb { fg = hsl(p.bright.yellow) },
   }
diff --git a/.vim/lua/lsp.lua b/.vim/lua/lsp.lua
index 91e2e2e..47eef75 100644
--- a/.vim/lua/lsp.lua
+++ b/.vim/lua/lsp.lua
@@ -106,18 +106,23 @@ local setup = function()
     if #actions == 1 then
       action_chosen = actions[1]
     else
-      local option_strings = {'Code Actions:'}
+      local option_strings = {}
       for i, action in ipairs(actions) do
         local title = action.title:gsub('\r\n', '\\r\\n')
         title = title:gsub('\n', '\\n')
         table.insert(option_strings, string.format('%d. %s', i, title))
       end
 
-      local choice = vim.fn.inputlist(option_strings)
-      if choice < 1 or choice > #actions then
-        return
-      end
-      action_chosen = actions[choice]
+      vim.ui.select(option_strings,
+        {
+          prompt = 'Code Actions:',
+        },
+        function(choice)
+          if choice < 1 or choice > #actions then
+            return
+          end
+          action_chosen = actions[choice]
+      end)
     end
 
     if action_chosen.edit or type(action_chosen.command) == 'table' then
diff --git a/.vim/lua/misc.lua b/.vim/lua/misc.lua
index d1686c2..7cb2ad9 100644
--- a/.vim/lua/misc.lua
+++ b/.vim/lua/misc.lua
@@ -22,7 +22,7 @@ function M.open_under_cursor(cmd)
   return M.file_under_cursor(function(txt)
     if not cmd then
       vim.fn.inputsave()
-      cmd = vim.fn.input('open with: ')
+      vim.ui.input('open with: ', function(result) cmd = result end)
       vim.fn.inputrestore()
     end
     if cmd then
@@ -58,12 +58,12 @@ function M.sort_line()
 end
 
 function M.live_grep(dirs)
-  dirs = dirs or vim.fn.input('Dirs: ')
+  if not dirs then vim.ui.input('Dirs: ', function(result) dirs = result end) end
   require('telescope.builtin').live_grep {search_dirs=vim.split(dirs, ',')}
 end
 
 function M.find_files(dirs)
-  dirs = dirs or vim.fn.input('Dirs: ')
+  if not dirs then vim.ui.input('Dirs: ', function(result) dirs = result end) end
   require('telescope.builtin').find_files {search_dirs=vim.split(dirs, ',')}
 end
 
diff --git a/.vim/lua/zk.lua b/.vim/lua/zk.lua
index bb7fe35..242badc 100644
--- a/.vim/lua/zk.lua
+++ b/.vim/lua/zk.lua
@@ -3,8 +3,12 @@ local function zk_new(path, title_dir)
   path = path or vim.loop.cwd()
   if not (path and #path > 0) then return end
 
-  title_dir = title_dir or vim.fn.input('New Zettel: ')
-  if not title_dir or (title_dir == "") then return end
+  if not title_dir then
+    vim.ui.input('New Zettel: ', function(result)
+      title_dir = result
+      end)
+  end
+  if title_dir == "" then return end
 
   local o = {}
   local parts = vim.split(title_dir, '/')