Merge remote-tracking branch 'upstream/master' into rahm

1 files changed, 41 insertions, 1 deletions

diff --git a/test/functional/plugin/lsp/diagnostic_spec.lua b/test/functional/plugin/lsp/diagnostic_spec.lua
index 1269a2350c..f73ffc29b0 100644
--- a/test/functional/plugin/lsp/diagnostic_spec.lua
+++ b/test/functional/plugin/lsp/diagnostic_spec.lua
@@ -3,6 +3,7 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local exec_lua = helpers.exec_lua
 local eq = helpers.eq
+local neq = require('test.helpers').neq
 
 describe('vim.lsp.diagnostic', function()
   local fake_uri
@@ -110,6 +111,7 @@ describe('vim.lsp.diagnostic', function()
         }
       ]]
       eq({code = 42, tags = {"foo", "bar"}, data = "Hello world"}, result[1].user_data.lsp)
+      eq(42, result[1].code)
       eq(42, result[2].code)
       eq({"foo", "bar"}, result[2].tags)
       eq("Hello world", result[2].data)
@@ -219,12 +221,50 @@ describe('vim.lsp.diagnostic', function()
 
         local diags = vim.diagnostic.get(diagnostic_bufnr)
         vim.lsp.stop_client(client_id)
-        vim.lsp._vim_exit_handler()
+        vim.api.nvim_exec_autocmds('VimLeavePre', { modeline = false })
         return diags
       ]], line)
       eq(1, #result)
       eq(exec_lua([[return vim.str_byteindex(..., 7, true)]], line), result[1].col)
       eq(exec_lua([[return vim.str_byteindex(..., 8, true)]], line), result[1].end_col)
     end)
+
+    it('does not create buffer on empty diagnostics', function()
+      local bufnr
+
+      -- No buffer is created without diagnostics
+      bufnr = exec_lua [[
+        vim.lsp.diagnostic.on_publish_diagnostics(nil, {
+          uri = "file:///fake/uri2",
+          diagnostics = {},
+        }, {client_id=client_id})
+        return vim.fn.bufnr(vim.uri_to_fname("file:///fake/uri2"))
+      ]]
+      eq(bufnr, -1)
+
+      -- Create buffer on diagnostics
+      bufnr = exec_lua [[
+        vim.lsp.diagnostic.on_publish_diagnostics(nil, {
+          uri = "file:///fake/uri2",
+          diagnostics = {
+            make_error('Diagnostic', 0, 0, 0, 0),
+          },
+        }, {client_id=client_id})
+        return vim.fn.bufnr(vim.uri_to_fname("file:///fake/uri2"))
+      ]]
+      neq(bufnr, -1)
+      eq(exec_lua([[return #vim.diagnostic.get(...)]], bufnr), 1)
+
+      -- Clear diagnostics after buffer was created
+      bufnr = exec_lua [[
+        vim.lsp.diagnostic.on_publish_diagnostics(nil, {
+          uri = "file:///fake/uri2",
+          diagnostics = {},
+        }, {client_id=client_id})
+        return vim.fn.bufnr(vim.uri_to_fname("file:///fake/uri2"))
+      ]]
+      neq(bufnr, -1)
+      eq(exec_lua([[return #vim.diagnostic.get(...)]], bufnr), 0)
+    end)
   end)
 end)