Merge 4f5745aa8d into 738320188f

runtime/doc/lsp.txt

@@ -1126,9 +1126,6 @@ Lua module: vim.lsp.client                                        *lsp-client*
       • {server_capabilities}   (`lsp.ServerCapabilities?`) Response from the
                                 server sent on `initialize` describing the
                                 server's capabilities.
-      • {server_info}           (`lsp.ServerInfo?`) Response from the server
-                                sent on `initialize` describing information
-                                about the server.
       • {progress}              (`vim.lsp.Client.Progress`) A ring buffer
                                 (|vim.ringbuf()|) containing progress messages
                                 sent by the server. See

runtime/doc/news.txt

@@ -115,7 +115,6 @@ LSP
 • |vim.lsp.util.make_position_params()|, |vim.lsp.util.make_range_params()|
   and |vim.lsp.util.make_given_range_params()| now require the `position_encoding`
   parameter.
-• `:checkhealth vim.lsp` displays the server version (if available).
 
 LUA
 

runtime/lua/vim/lsp.lua

@@ -211,7 +211,7 @@ local function reuse_client_default(client, config)
 
   for _, config_folder in ipairs(config_folders) do
     local found = false
-    for _, client_folder in ipairs(client.workspace_folders or {}) do
+    for _, client_folder in ipairs(client.workspace_folders) do
       if config_folder.uri == client_folder.uri then
         found = true
         break

runtime/lua/vim/lsp/client.lua

@@ -174,10 +174,6 @@ local validate = vim.validate
 --- capabilities.
 --- @field server_capabilities lsp.ServerCapabilities?
 ---
---- Response from the server sent on `initialize` describing information about
---- the server.
---- @field server_info lsp.ServerInfo?
----
 --- A ring buffer (|vim.ringbuf()|) containing progress messages
 --- sent by the server.
 --- @field progress vim.lsp.Client.Progress
@@ -560,8 +556,6 @@ function Client:initialize()
       self.offset_encoding = self.server_capabilities.positionEncoding
     end
 
-    self.server_info = result.serverInfo
-
     if next(self.settings) then
       self:notify(ms.workspace_didChangeConfiguration, { settings = self.settings })
     end

runtime/lua/vim/lsp/health.lua

@@ -40,8 +40,6 @@ local function check_active_clients()
   local clients = vim.lsp.get_clients()
   if next(clients) then
     for _, client in pairs(clients) do
-      local server_version = vim.tbl_get(client, 'server_info', 'version')
-        or '? (no serverInfo.version response)'
       local cmd ---@type string
       local ccmd = client.config.cmd
       if type(ccmd) == 'table' then
@@ -64,7 +62,6 @@ local function check_active_clients()
       end
       report_info(table.concat({
         string.format('%s (id: %d)', client.name, client.id),
-        string.format('- Version: %s', server_version),
         dirs_info,
         string.format('- Command: %s', cmd),
         string.format('- Settings: %s', vim.inspect(client.settings, { newline = '\n  ' })),

runtime/plugin/man.lua

@@ -8,9 +8,9 @@ vim.api.nvim_create_user_command('Man', function(params)
   if params.bang then
     man.init_pager()
   else
-    local err = man.open_page(params.count, params.smods, params.fargs)
-    if err then
-      vim.notify('man.lua: ' .. err, vim.log.levels.ERROR)
+    local ok, err = pcall(man.open_page, params.count, params.smods, params.fargs)
+    if not ok then
+      vim.notify(man.errormsg or err, vim.log.levels.ERROR)
     end
   end
 end, {
@@ -31,9 +31,6 @@ vim.api.nvim_create_autocmd('BufReadCmd', {
   pattern = 'man://*',
   nested = true,
   callback = function(params)
-    local err = require('man').read_page(assert(params.match:match('man://(.*)')))
-    if err then
-      vim.notify('man.lua: ' .. err, vim.log.levels.ERROR)
-    end
+    require('man').read_page(vim.fn.matchstr(params.match, 'man://\\zs.*'))
   end,
 })

src/nvim/api/vimscript.c

@@ -229,9 +229,10 @@ static Object _call_function(String fn, Array args, dict_T *self, Arena *arena,
   funcexe.fe_selfdict = self;
 
   TRY_WRAP(err, {
-    // call_func() retval is deceptive, ignore it.  Instead TRY_WRAP sets `msg_list` to capture
-    // abort-causing non-exception errors.
-    (void)call_func(fn.data, (int)fn.size, &rettv, (int)args.size, vim_args, &funcexe);
+    // call_func() retval is deceptive, ignore it.  Instead we set `msg_list`
+    // (see above) to capture abort-causing non-exception errors.
+    call_func(fn.data, (int)fn.size, &rettv, (int)args.size,
+              vim_args, &funcexe);
   });
 
   if (!ERROR_SET(err)) {
@@ -279,23 +280,18 @@ Object nvim_call_dict_function(Object dict, String fn, Array args, Arena *arena,
   typval_T rettv;
   bool mustfree = false;
   switch (dict.type) {
-  case kObjectTypeString: {
-    int eval_ret;
+  case kObjectTypeString:
     TRY_WRAP(err, {
-        eval_ret = eval0(dict.data.string.data, &rettv, NULL, &EVALARG_EVALUATE);
-        clear_evalarg(&EVALARG_EVALUATE, NULL);
-      });
+      eval0(dict.data.string.data, &rettv, NULL, &EVALARG_EVALUATE);
+      clear_evalarg(&EVALARG_EVALUATE, NULL);
+    });
     if (ERROR_SET(err)) {
       return rv;
     }
-    if (eval_ret != OK) {
-      abort();  // Should not happen.
-    }
     // Evaluation of the string arg created a new dict or increased the
     // refcount of a dict. Not necessary for a RPC dict.
     mustfree = true;
     break;
-  }
   case kObjectTypeDict:
     object_to_vim(dict, &rettv, err);
     break;

src/nvim/terminal.c

@@ -641,6 +641,9 @@ bool terminal_enter(void)
   curwin->w_p_so = 0;
   curwin->w_p_siso = 0;
 
+  // Save the existing cursor entry since it may be modified by the application
+  cursorentry_T save_cursorentry = shape_table[SHAPE_IDX_TERM];
+
   // Update the cursor shape table and flush changes to the UI
   s->term->pending.cursor = true;
   refresh_cursor(s->term);
@@ -671,8 +674,8 @@ bool terminal_enter(void)
   RedrawingDisabled = s->save_rd;
   apply_autocmds(EVENT_TERMLEAVE, NULL, NULL, false, curbuf);
 
-  // Restore the terminal cursor to what is set in 'guicursor'
-  (void)parse_shape_opt(SHAPE_CURSOR);
+  shape_table[SHAPE_IDX_TERM] = save_cursorentry;
+  ui_mode_info_set();
 
   if (save_curwin == curwin->handle) {  // Else: window was closed.
     curwin->w_p_cul = save_w_p_cul;

test/functional/plugin/lsp_spec.lua

@@ -1854,20 +1854,6 @@ describe('LSP', function()
         end,
       }
     end)
-
-    it('vim.lsp.start when existing client has no workspace_folders', function()
-      exec_lua(create_server_definition)
-      eq(
-        { 2, 'foo', 'foo' },
-        exec_lua(function()
-          local server = _G._create_server()
-          vim.lsp.start { cmd = server.cmd, name = 'foo' }
-          vim.lsp.start { cmd = server.cmd, name = 'foo', root_dir = 'bar' }
-          local foos = vim.lsp.get_clients()
-          return { #foos, foos[1].name, foos[2].name }
-        end)
-      )
-    end)
   end)
 
   describe('parsing tests', function()

test/functional/plugin/man_spec.lua

@@ -21,12 +21,13 @@ local function get_search_history(name)
     local man = require('man')
     local res = {}
     --- @diagnostic disable-next-line:duplicate-set-field
-    man._find_path = function(name0, sect)
+    man.find_path = function(sect, name0)
       table.insert(res, { sect, name0 })
       return nil
     end
-    local err = man.open_page(-1, { tab = 0 }, args)
-    assert(err and err:match('no manual entry'))
+    local ok, rv = pcall(man.open_page, -1, { tab = 0 }, args)
+    assert(not ok)
+    assert(rv and rv:match('no manual entry'))
     return res
   end)
 end
@@ -224,7 +225,7 @@ describe(':Man', function()
     matches('^/.+', actual_file)
     local args = { nvim_prog, '--headless', '+:Man ' .. actual_file, '+q' }
     matches(
-      ('Error detected while processing command line:\r\n' .. 'man.lua: no manual entry for %s'):format(
+      ('Error detected while processing command line:\r\n' .. 'man.lua: "no manual entry for %s"'):format(
         pesc(actual_file)
       ),
       fn.system(args, { '' })
@@ -234,8 +235,8 @@ describe(':Man', function()
 
   it('tries variants with spaces, underscores #22503', function()
     eq({
-      { vim.NIL, 'NAME WITH SPACES' },
-      { vim.NIL, 'NAME_WITH_SPACES' },
+      { '', 'NAME WITH SPACES' },
+      { '', 'NAME_WITH_SPACES' },
     }, get_search_history('NAME WITH SPACES'))
     eq({
       { '3', 'some other man' },
@@ -254,8 +255,8 @@ describe(':Man', function()
       { 'n', 'some_other_man' },
     }, get_search_history('n some other man'))
     eq({
-      { vim.NIL, '123some other man' },
-      { vim.NIL, '123some_other_man' },
+      { '', '123some other man' },
+      { '', '123some_other_man' },
     }, get_search_history('123some other man'))
     eq({
       { '1', 'other_man' },
@@ -264,10 +265,11 @@ describe(':Man', function()
   end)
 
   it('can complete', function()
+    t.skip(t.is_os('mac') and t.is_arch('x86_64'), 'not supported on intel mac')
     eq(
       true,
       exec_lua(function()
-        return #require('man').man_complete('f', 'Man f') > 0
+        return #require('man').man_complete('f', 'Man g') > 0
       end)
     )
   end)

test/functional/terminal/cursor_spec.lua

@@ -15,20 +15,9 @@ local skip = t.skip
 describe(':terminal cursor', function()
   local screen
 
-  local terminal_mode_idx ---@type number
-
   before_each(function()
     clear()
     screen = tt.setup_screen()
-
-    if terminal_mode_idx == nil then
-      for i, v in ipairs(screen._mode_info) do
-        if v.name == 'terminal' then
-          terminal_mode_idx = i
-        end
-      end
-      assert(terminal_mode_idx)
-    end
   end)
 
   it('moves the screen cursor when focused', function()
@@ -154,6 +143,13 @@ describe(':terminal cursor', function()
 
   it('can be modified by application #3681', function()
     skip(is_os('win'), '#31587')
+    local idx ---@type number
+    for i, v in ipairs(screen._mode_info) do
+      if v.name == 'terminal' then
+        idx = i
+      end
+    end
+    assert(idx)
 
     local states = {
       [1] = { blink = true, shape = 'block' },
@@ -175,13 +171,13 @@ describe(':terminal cursor', function()
       ]],
         condition = function()
           if v.blink then
-            eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-            eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
+            eq(500, screen._mode_info[idx].blinkon)
+            eq(500, screen._mode_info[idx].blinkoff)
           else
-            eq(0, screen._mode_info[terminal_mode_idx].blinkon)
-            eq(0, screen._mode_info[terminal_mode_idx].blinkoff)
+            eq(0, screen._mode_info[idx].blinkon)
+            eq(0, screen._mode_info[idx].blinkoff)
           end
-          eq(v.shape, screen._mode_info[terminal_mode_idx].cursor_shape)
+          eq(v.shape, screen._mode_info[idx].cursor_shape)
         end,
       })
     end
@@ -195,13 +191,20 @@ describe(':terminal cursor', function()
     ]])
 
     -- Cursor returns to default on TermLeave
-    eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-    eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
-    eq('block', screen._mode_info[terminal_mode_idx].cursor_shape)
+    eq(500, screen._mode_info[idx].blinkon)
+    eq(500, screen._mode_info[idx].blinkoff)
+    eq('block', screen._mode_info[idx].cursor_shape)
   end)
 
   it('can be modified per terminal', function()
     skip(is_os('win'), '#31587')
+    local idx ---@type number
+    for i, v in ipairs(screen._mode_info) do
+      if v.name == 'terminal' then
+        idx = i
+      end
+    end
+    assert(idx)
 
     -- Set cursor to vertical bar with blink
     tt.feed_csi('5 q')
@@ -213,9 +216,9 @@ describe(':terminal cursor', function()
       {3:-- TERMINAL --}                                    |
     ]],
       condition = function()
-        eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-        eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
-        eq('vertical', screen._mode_info[terminal_mode_idx].cursor_shape)
+        eq(500, screen._mode_info[idx].blinkon)
+        eq(500, screen._mode_info[idx].blinkoff)
+        eq('vertical', screen._mode_info[idx].cursor_shape)
       end,
     })
 
@@ -228,9 +231,9 @@ describe(':terminal cursor', function()
       {3:-- TERMINAL --}                                    |
     ]],
       condition = function()
-        eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-        eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
-        eq('vertical', screen._mode_info[terminal_mode_idx].cursor_shape)
+        eq(500, screen._mode_info[idx].blinkon)
+        eq(500, screen._mode_info[idx].blinkoff)
+        eq('vertical', screen._mode_info[idx].cursor_shape)
       end,
     })
 
@@ -253,9 +256,9 @@ describe(':terminal cursor', function()
     ]],
       condition = function()
         -- New terminal, cursor resets to defaults
-        eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-        eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
-        eq('block', screen._mode_info[terminal_mode_idx].cursor_shape)
+        eq(500, screen._mode_info[idx].blinkon)
+        eq(500, screen._mode_info[idx].blinkoff)
+        eq('block', screen._mode_info[idx].cursor_shape)
       end,
     })
 
@@ -272,9 +275,9 @@ describe(':terminal cursor', function()
       {3:-- TERMINAL --}                                    |
     ]],
       condition = function()
-        eq(0, screen._mode_info[terminal_mode_idx].blinkon)
-        eq(0, screen._mode_info[terminal_mode_idx].blinkoff)
-        eq('horizontal', screen._mode_info[terminal_mode_idx].cursor_shape)
+        eq(0, screen._mode_info[idx].blinkon)
+        eq(0, screen._mode_info[idx].blinkoff)
+        eq('horizontal', screen._mode_info[idx].cursor_shape)
       end,
     })
 
@@ -291,9 +294,9 @@ describe(':terminal cursor', function()
       {3:-- TERMINAL --}                                    |
     ]],
       condition = function()
-        eq(500, screen._mode_info[terminal_mode_idx].blinkon)
-        eq(500, screen._mode_info[terminal_mode_idx].blinkoff)
-        eq('vertical', screen._mode_info[terminal_mode_idx].cursor_shape)
+        eq(500, screen._mode_info[idx].blinkon)
+        eq(500, screen._mode_info[idx].blinkoff)
+        eq('vertical', screen._mode_info[idx].cursor_shape)
       end,
     })
   end)
@@ -323,32 +326,6 @@ describe(':terminal cursor', function()
       {3:-- TERMINAL --}                                    |
     ]])
   end)
-
-  it('preserves guicursor value on TermLeave #31612', function()
-    eq(3, screen._mode_info[terminal_mode_idx].hl_id)
-
-    -- Change 'guicursor' while terminal mode is active
-    command('set guicursor+=t:Error')
-
-    local error_hl_id = call('hlID', 'Error')
-
-    screen:expect({
-      condition = function()
-        eq(error_hl_id, screen._mode_info[terminal_mode_idx].hl_id)
-      end,
-    })
-
-    -- Exit terminal mode
-    feed([[<C-\><C-N>]])
-
-    screen:expect([[
-      tty ready                                         |
-      ^                                                  |
-                                                        |*5
-    ]])
-
-    eq(error_hl_id, screen._mode_info[terminal_mode_idx].hl_id)
-  end)
 end)
 
 describe('buffer cursor position is correct in terminal without number column', function()
@@ -373,6 +350,12 @@ describe('buffer cursor position is correct in terminal without number column',
     }, {
       cols = 70,
     })
+    screen:set_default_attr_ids({
+      [1] = { foreground = 253, background = 11 },
+      [2] = { reverse = true },
+      [3] = { bold = true },
+      [4] = { background = 11 },
+    })
     -- Also check for real cursor position, as it is used for stuff like input methods
     screen._handle_busy_start = function() end
     screen._handle_busy_stop = function() end
@@ -684,6 +667,13 @@ describe('buffer cursor position is correct in terminal with number column', fun
     }, {
       cols = 70,
     })
+    screen:set_default_attr_ids({
+      [1] = { foreground = 253, background = 11 },
+      [2] = { reverse = true },
+      [3] = { bold = true },
+      [4] = { background = 11 },
+      [7] = { foreground = 130 },
+    })
     -- Also check for real cursor position, as it is used for stuff like input methods
     screen._handle_busy_start = function() end
     screen._handle_busy_stop = function() end