3 files changed, 41 insertions, 14 deletions

diff --git a/test/functional/plugin/lsp/helpers.lua b/test/functional/plugin/lsp/helpers.lua
index 028ccb9e2c..caab174b4d 100644
--- a/test/functional/plugin/lsp/helpers.lua
+++ b/test/functional/plugin/lsp/helpers.lua
@@ -80,17 +80,14 @@ M.fake_lsp_logfile = 'Xtest-fake-lsp.log'
 local function fake_lsp_server_setup(test_name, timeout_ms, options, settings)
   exec_lua([=[
     lsp = require('vim.lsp')
-    local test_name, fixture_filename, logfile, timeout, options, settings = ...
+    local test_name, fake_lsp_code, fake_lsp_logfile, timeout, options, settings = ...
     TEST_RPC_CLIENT_ID = lsp.start_client {
       cmd_env = {
-        NVIM_LOG_FILE = logfile;
+        NVIM_LOG_FILE = fake_lsp_logfile;
         NVIM_LUA_NOTRACK = "1";
       };
       cmd = {
-        vim.v.progpath, '-Es', '-u', 'NONE', '--headless',
-        "-c", string.format("lua TEST_NAME = %q", test_name),
-        "-c", string.format("lua TIMEOUT = %d", timeout),
-        "-c", "luafile "..fixture_filename,
+        vim.v.progpath, '-l', fake_lsp_code, test_name, tostring(timeout),
       };
       handlers = setmetatable({}, {
         __index = function(t, method)
diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index 93fada8a50..fd162961ff 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -46,16 +46,14 @@ describe('LSP', function()
     local test_name = "basic_init"
     exec_lua([=[
       lsp = require('vim.lsp')
-      local test_name, fixture_filename, logfile = ...
+      local test_name, fake_lsp_code, fake_lsp_logfile = ...
       function test__start_client()
         return lsp.start_client {
           cmd_env = {
-            NVIM_LOG_FILE = logfile;
+            NVIM_LOG_FILE = fake_lsp_logfile;
           };
           cmd = {
-            vim.v.progpath, '-Es', '-u', 'NONE', '--headless',
-            "-c", string.format("lua TEST_NAME = %q", test_name),
-            "-c", "luafile "..fixture_filename;
+            vim.v.progpath, '-l', fake_lsp_code, test_name;
           };
           workspace_folders = {{
               uri = 'file://' .. vim.loop.cwd(),
@@ -3432,6 +3430,38 @@ describe('LSP', function()
       }
       eq(expected_range, result[3].params.range)
     end)
+    it('Aborts with notify if no clients support requested method', function()
+      exec_lua(create_server_definition)
+      exec_lua([[
+        vim.notify = function(msg, _)
+          notify_msg = msg
+        end
+      ]])
+      local fail_msg = "[LSP] Format request failed, no matching language servers."
+      local function check_notify(name, formatting, range_formatting)
+        local timeout_msg = "[LSP][" .. name .. "] timeout"
+        exec_lua([[
+          local formatting, range_formatting, name = ...
+          local server = _create_server({ capabilities = {
+            documentFormattingProvider = formatting,
+            documentRangeFormattingProvider = range_formatting,
+          }})
+          vim.lsp.start({ name = name, cmd = server.cmd })
+          notify_msg = nil
+          vim.lsp.buf.format({ name = name, timeout_ms = 1 })
+        ]], formatting, range_formatting, name)
+        eq(formatting and timeout_msg or fail_msg, exec_lua('return notify_msg'))
+        exec_lua([[
+          notify_msg = nil
+          vim.lsp.buf.format({ name = name, timeout_ms = 1, range = {start={1, 0}, ['end']={1, 0}}})
+        ]])
+        eq(range_formatting and timeout_msg or fail_msg, exec_lua('return notify_msg'))
+      end
+      check_notify("none", false, false)
+      check_notify("formatting", true, false)
+      check_notify("rangeFormatting", false, true)
+      check_notify("both", true, true)
+    end)
   end)
   describe('cmd', function()
     it('can connect to lsp server via rpc.connect', function()
diff --git a/test/functional/plugin/man_spec.lua b/test/functional/plugin/man_spec.lua
index c6c7d2b03d..58da059be6 100644
--- a/test/functional/plugin/man_spec.lua
+++ b/test/functional/plugin/man_spec.lua
@@ -59,7 +59,7 @@ describe(':Man', function()
 
       screen:expect([[
       ^this {b:is} {b:a} test                                      |
-      with {u:overstruck} text                                |
+      with {i:overstruck} text                                |
       {eob:~                                                   }|
       {eob:~                                                   }|
                                                           |
@@ -98,7 +98,7 @@ describe(':Man', function()
 
       screen:expect([[
       ^this {b:is} {b:あ} test                                     |
-      with {u:överstrũck} te{i:xt¶}                               |
+      with {i:överstrũck} te{i:xt¶}                               |
       {eob:~                                                   }|
       {eob:~                                                   }|
                                                           |
@@ -115,7 +115,7 @@ describe(':Man', function()
       screen:expect([[
       {b:^_begins}                                             |
       {b:mid_dle}                                             |
-      {u:mid_dle}                                             |
+      {i:mid_dle}                                             |
       {eob:~                                                   }|
                                                           |
       ]])