Merge pull request #14184 from tjdevries/tjdevries/nit_diagnostics

lsp: some small diagnostic fixes

2 files changed, 17 insertions, 2 deletions

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index f0845bfc80..4c453df3f6 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -293,6 +293,19 @@ local function text_document_did_open_handler(bufnr, client)
   }
   client.notify('textDocument/didOpen', params)
   util.buf_versions[bufnr] = params.textDocument.version
+
+  -- Next chance we get, we should re-do the diagnostics
+  vim.schedule(function()
+    vim.lsp.handlers["textDocument/publishDiagnostics"](
+      nil,
+      "textDocument/publishDiagnostics",
+      {
+        diagnostics = vim.lsp.diagnostic.get(bufnr, client.id),
+        uri = vim.uri_from_bufnr(bufnr),
+      },
+      client.id
+    )
+  end)
 end
 
 -- FIXME: DOC: Shouldn't need to use a dummy function
diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index a1f24706c0..4e82c46fef 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -270,8 +270,10 @@ local function set_diagnostic_cache(diagnostics, bufnr, client_id)
       diagnostic.severity = DiagnosticSeverity.Error
     end
     -- Account for servers that place diagnostics on terminating newline
-    local start = diagnostic.range.start
-    start.line = math.min(start.line, buf_line_count - 1)
+    if buf_line_count > 0 then
+      local start = diagnostic.range.start
+      start.line = math.min(start.line, buf_line_count - 1)
+    end
   end
 
   diagnostic_cache[bufnr][client_id] = diagnostics