Merge branch 'vis-next' into 'main'

use new vis 0.9 features

Closes #43

See merge request muhq/vis-lspc!42

1 files changed, 7 insertions, 5 deletions

diff --git a/init.lua b/init.lua
index 1d848d6..edb2b6c 100644
--- a/init.lua
+++ b/init.lua
@@ -1180,16 +1180,16 @@ local function ls_start_server(syntax)
   lspc.running[ls_conf.name] = ls
 
   -- register the response handler
-  vis.events.subscribe(vis.events.PROCESS_RESPONSE, function(name, msg, event)
+  vis.events.subscribe(vis.events.PROCESS_RESPONSE, function(name, event, code, msg)
     if name ~= ls.name then
       return
     end
 
     if event == 'EXIT' or event == 'SIGNAL' then
       if event == 'EXIT' then
-        vis:info('language server exited with: ' .. msg)
+        vis:info('language server exited with: ' .. code)
       else
-        vis:info('language server received signal: ' .. msg)
+        vis:info('language server received signal: ' .. code)
       end
 
       lspc.running[ls.name] = nil
@@ -1407,8 +1407,10 @@ vis:command_register('lspc-format', function(_, _, win)
     options = ls.formatting_options,
   }
   if params.options == nil then
-    -- probably a safe default, but this should be hooked up to the vis options
-    params.options = {tabSize = 4, insertSpaces = true}
+    params.options = {
+      tabSize = win.options.tabwidth,
+      insertSpaces = win.options.expandtab,
+    }
   end
 
   ls_call_text_document_method(ls, 'formatting', params, win)