From 69a0712a9c2bae0969f7a84e5ec321ce6120982b Mon Sep 17 00:00:00 2001
From: Ashkan Kiani <ashkan.k.kiani@gmail.com>
Date: Wed, 20 Nov 2019 11:23:50 -0800
Subject: Reduce code blocks in markdown previews.

If the preview is just a code block, then use the language as the
filetype instead of using markdown.
This reduces the size of the preview.
---
 runtime/lua/vim/lsp/builtin_callbacks.lua | 54 ++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp/builtin_callbacks.lua b/runtime/lua/vim/lsp/builtin_callbacks.lua
index cc739ce3ad..717fda395e 100644
--- a/runtime/lua/vim/lsp/builtin_callbacks.lua
+++ b/runtime/lua/vim/lsp/builtin_callbacks.lua
@@ -81,6 +81,56 @@ builtin_callbacks['textDocument/publishDiagnostics'] = function(_, _, result)
   -- util.buf_loclist(bufnr, result.diagnostics)
 end
 
+local function focusable_popup()
+  local popup_win
+  return function(winnr)
+    if popup_win and nvim.win_is_valid(popup_win) then
+      if nvim.get_current_win() == popup_win then
+        nvim.ex.wincmd "p"
+      else
+        nvim.set_current_win(popup_win)
+      end
+      return
+    end
+    popup_win = winnr
+  end
+end
+
+local hover_popup = focusable_popup()
+
+local function trim_empty_lines(lines)
+  local result = {}
+  for _, line in ipairs(lines) do
+    if #line > 0 then
+      table.insert(result, line)
+    end
+  end
+  return result
+end
+
+-- Accepts markdown lines and tries to reduce it to a filetype if it is
+-- just a single code block.
+local function try_trim_code_blocks(lines)
+  local language_id = lines[1]:match("^```(.*)")
+  if language_id then
+    local has_inner_code_fence = false
+    for i = 2, (#lines - 1) do
+      local line = lines[i]
+      if line:sub(1,3) == '```' then
+        has_inner_code_fence = true
+        break
+      end
+    end
+    -- No inner code fences + starting with code fence = hooray.
+    if not has_inner_code_fence then
+      table.remove(lines, 1)
+      table.remove(lines)
+      return lines, language_id
+    end
+  end
+  return lines, 'markdown'
+end
+
 -- textDocument/hover
 -- https://microsoft.github.io/language-server-protocol/specification#textDocument_hover
 -- @params MarkedString | MarkedString[] | MarkupContent
@@ -91,10 +141,12 @@ builtin_callbacks['textDocument/hover'] = function(_, _, result)
 
   if result.contents ~= nil then
     local markdown_lines = util.convert_input_to_markdown_lines(result.contents)
+    markdown_lines = trim_empty_lines(markdown_lines)
     if vim.tbl_isempty(markdown_lines) then
       markdown_lines = { 'No information available' }
     end
-    util.open_floating_preview(markdown_lines, 'markdown')
+    local _, winnr = util.open_floating_preview(try_trim_code_blocks(markdown_lines))
+    hover_popup(winnr)
   end
 end
 
-- 
cgit 


From 3ae9b3781e0b66f5874971665b38314d61668627 Mon Sep 17 00:00:00 2001
From: Ashkan Kiani <ashkan.k.kiani@gmail.com>
Date: Wed, 20 Nov 2019 11:34:10 -0800
Subject: Bugfix for floating_preview

Don't modify your inputs.
---
 runtime/lua/vim/lsp/util.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index f96e0f01a8..707e2d0d3b 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -262,6 +262,9 @@ function M.open_floating_preview(contents, filetype, opts)
     opts = { opts, 't', true };
   }
 
+  -- Don't modify our inputs.
+  contents = vim.deepcopy(contents)
+
   -- Trim empty lines from the end.
   for i = #contents, 1, -1 do
     if #contents[i] == 0 then
-- 
cgit 


From 0904ffe387f825404d8467f9787678c2251728dd Mon Sep 17 00:00:00 2001
From: Ashkan Kiani <ashkan.k.kiani@gmail.com>
Date: Wed, 20 Nov 2019 11:36:50 -0800
Subject: Bugfixes.

- Return after an error in RPC.
- Use an empty vim table for serialization.
---
 runtime/lua/vim/lsp.lua     | 2 +-
 runtime/lua/vim/lsp/rpc.lua | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 9dbe03dace..4724ff0281 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -400,7 +400,7 @@ function lsp.start_client(config)
     rpc.request('initialize', initialize_params, function(init_err, result)
       assert(not init_err, tostring(init_err))
       assert(result, "server sent empty result")
-      rpc.notify('initialized', {})
+      rpc.notify('initialized', {[vim.type_idx]=vim.types.dictionary})
       client.initialized = true
       uninitialized_clients[client_id] = nil
       client.server_capabilities = assert(result.capabilities, "initialize result doesn't contain capabilities")
diff --git a/runtime/lua/vim/lsp/rpc.lua b/runtime/lua/vim/lsp/rpc.lua
index e0ec8863d6..a558f66a42 100644
--- a/runtime/lua/vim/lsp/rpc.lua
+++ b/runtime/lua/vim/lsp/rpc.lua
@@ -340,6 +340,7 @@ local function create_and_start_client(cmd, cmd_args, handlers, extra_spawn_para
     local decoded, err = json_decode(body)
     if not decoded then
       on_error(client_errors.INVALID_SERVER_JSON, err)
+      return
     end
     local _ = log.debug() and log.debug("decoded", decoded)
 
-- 
cgit 


From 568b4540884bb852b733dfcdd6a2da0d4fe2b42e Mon Sep 17 00:00:00 2001
From: Ashkan Kiani <ashkan.k.kiani@gmail.com>
Date: Wed, 20 Nov 2019 11:39:54 -0800
Subject: Add vim.uri_to_bufnr

---
 runtime/lua/vim/lsp/builtin_callbacks.lua | 8 ++------
 runtime/lua/vim/uri.lua                   | 7 ++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp/builtin_callbacks.lua b/runtime/lua/vim/lsp/builtin_callbacks.lua
index 717fda395e..a5e1162d02 100644
--- a/runtime/lua/vim/lsp/builtin_callbacks.lua
+++ b/runtime/lua/vim/lsp/builtin_callbacks.lua
@@ -62,14 +62,10 @@ builtin_callbacks['textDocument/rename'] = function(_, _, result)
   util.workspace_apply_workspace_edit(result)
 end
 
-local function uri_to_bufnr(uri)
-  return vim.fn.bufadd((vim.uri_to_fname(uri)))
-end
-
 builtin_callbacks['textDocument/publishDiagnostics'] = function(_, _, result)
   if not result then return end
   local uri = result.uri
-  local bufnr = uri_to_bufnr(uri)
+  local bufnr = vim.uri_to_bufnr(uri)
   if not bufnr then
     api.nvim_err_writeln(string.format("LSP.publishDiagnostics: Couldn't find buffer for %s", uri))
     return
@@ -154,7 +150,7 @@ builtin_callbacks['textDocument/peekDefinition'] = function(_, _, result)
   if result == nil or vim.tbl_isempty(result) then return end
   -- TODO(ashkan) what to do with multiple locations?
   result = result[1]
-  local bufnr = uri_to_bufnr(result.uri)
+  local bufnr = vim.uri_to_bufnr(result.uri)
   assert(bufnr)
   local start = result.range.start
   local finish = result.range["end"]
diff --git a/runtime/lua/vim/uri.lua b/runtime/lua/vim/uri.lua
index 0a6e0fcb97..1065f84f4c 100644
--- a/runtime/lua/vim/uri.lua
+++ b/runtime/lua/vim/uri.lua
@@ -77,13 +77,18 @@ local function uri_to_fname(uri)
   else
     uri = uri:gsub('^file://', '')
   end
-
   return uri_decode(uri)
 end
 
+-- Return or create a buffer for a uri.
+local function uri_to_bufnr(uri)
+  return vim.fn.bufadd((uri_to_fname(uri)))
+end
+
 return {
   uri_from_fname = uri_from_fname,
   uri_from_bufnr = uri_from_bufnr,
   uri_to_fname = uri_to_fname,
+  uri_to_bufnr = uri_to_bufnr,
 }
 -- vim:sw=2 ts=2 et
-- 
cgit 


From ff65cc990afba288df6d39d6f95901cf0786c668 Mon Sep 17 00:00:00 2001
From: Ashkan Kiani <ashkan.k.kiani@gmail.com>
Date: Wed, 20 Nov 2019 11:41:45 -0800
Subject: Bugfix. Don't use nvim.lua that doesn't exist :)

---
 runtime/lua/vim/lsp/builtin_callbacks.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp/builtin_callbacks.lua b/runtime/lua/vim/lsp/builtin_callbacks.lua
index a5e1162d02..2229547f20 100644
--- a/runtime/lua/vim/lsp/builtin_callbacks.lua
+++ b/runtime/lua/vim/lsp/builtin_callbacks.lua
@@ -80,11 +80,11 @@ end
 local function focusable_popup()
   local popup_win
   return function(winnr)
-    if popup_win and nvim.win_is_valid(popup_win) then
-      if nvim.get_current_win() == popup_win then
-        nvim.ex.wincmd "p"
+    if popup_win and api.nvim_win_is_valid(popup_win) then
+      if api.nvim_get_current_win() == popup_win then
+        api.nvim_command("wincmd p")
       else
-        nvim.set_current_win(popup_win)
+        api.nvim_set_current_win(popup_win)
       end
       return
     end
-- 
cgit 


From c83380cf80561d45c067db5e70c7275eda7671af Mon Sep 17 00:00:00 2001
From: Ashkan Kiani <ashkan.k.kiani@gmail.com>
Date: Wed, 20 Nov 2019 14:21:57 -0800
Subject: Add lsp.buf and hover implementation.

---
 runtime/lua/vim/lsp/buf.lua | 85 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 runtime/lua/vim/lsp/buf.lua

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
new file mode 100644
index 0000000000..6398bcca74
--- /dev/null
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -0,0 +1,85 @@
+local validate = vim.validate
+local api = vim.api
+local util = require 'vim.lsp.util'
+local protocol = require 'vim.lsp.protocol'
+
+local M = {}
+
+local function resolve_bufnr(bufnr)
+  validate { bufnr = { bufnr, 'n', true } }
+  if bufnr == nil or bufnr == 0 then
+    return api.nvim_get_current_buf()
+  end
+  return bufnr
+end
+
+local function ok_or_nil(status, ...)
+	if not status then return end
+	return ...
+end
+local function npcall(fn, ...)
+	return ok_or_nil(pcall(fn, ...))
+end
+
+local function find_window_by_var(name, value)
+	for _, win in ipairs(api.nvim_list_wins()) do
+		if npcall(api.nvim_win_get_var, win, name) == value then
+			return win
+		end
+	end
+end
+
+local hover_window_tag = 'lsp_hover'
+function M.hover(bufnr)
+	if npcall(api.nvim_win_get_var, 0, hover_window_tag) then
+		api.nvim_command("wincmd p")
+		return
+	end
+
+	bufnr = resolve_bufnr(bufnr)
+	do
+		local win = find_window_by_var(hover_window_tag, bufnr)
+		if win then
+			api.nvim_set_current_win(win)
+			return
+		end
+	end
+	local params = protocol.make_text_document_position_params()
+	vim.lsp.buf_request(bufnr, 'textDocument/hover', params, function(_, _, result, _)
+		if result == nil or vim.tbl_isempty(result) then
+			return
+		end
+
+		if result.contents ~= nil then
+			local markdown_lines = util.convert_input_to_markdown_lines(result.contents)
+			markdown_lines = util.trim_empty_lines(markdown_lines)
+			if vim.tbl_isempty(markdown_lines) then
+				markdown_lines = { 'No information available' }
+			end
+			local filetype = util.try_trim_markdown_code_blocks(markdown_lines)
+			local _, winnr = util.open_floating_preview(markdown_lines, filetype)
+			api.nvim_win_set_var(winnr, hover_window_tag, bufnr)
+		end
+	end)
+end
+
+function M.signature_help()
+end
+
+function M.declaration()
+end
+
+function M.type_definition()
+end
+
+function M.implementation()
+end
+
+-- TODO(ashkan) ?
+function M.completion()
+end
+
+function M.range_formatting()
+end
+
+return M
-- 
cgit 


From 2d580756ca707945c01703d404e10f4bf412a72c Mon Sep 17 00:00:00 2001
From: Ashkan Kiani <ashkan.k.kiani@gmail.com>
Date: Wed, 20 Nov 2019 15:35:18 -0800
Subject: Add everything to lsp.buf and get rid of autoload.

---
 runtime/lua/vim/lsp/buf.lua  | 161 ++++++++++++++++++++++++++++++++++++-------
 runtime/lua/vim/lsp/util.lua |  88 +++++++++++++++++------
 2 files changed, 204 insertions(+), 45 deletions(-)

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 6398bcca74..5f54196dcc 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -1,7 +1,9 @@
 local validate = vim.validate
 local api = vim.api
+local vfn = vim.fn
 local util = require 'vim.lsp.util'
 local protocol = require 'vim.lsp.protocol'
+local log = require 'vim.lsp.log'
 
 local M = {}
 
@@ -29,54 +31,165 @@ local function find_window_by_var(name, value)
 	end
 end
 
-local hover_window_tag = 'lsp_hover'
-function M.hover(bufnr)
-	if npcall(api.nvim_win_get_var, 0, hover_window_tag) then
-		api.nvim_command("wincmd p")
-		return
+local function request(method, params, callback)
+	--	TODO(ashkan) enable this.
+	--	callback = vim.lsp.default_callback[method] or callback
+	validate {
+		method = {method, 's'};
+		callback = {callback, 'f'};
+	}
+	return vim.lsp.buf_request(0, method, params, function(err, _, result, client_id)
+		if err then error(tostring(err)) end
+		return callback(err, method, result, client_id)
+	end)
+end
+
+local function focusable_preview(method, params, fn)
+	if npcall(api.nvim_win_get_var, 0, method) then
+		return api.nvim_command("wincmd p")
 	end
 
-	bufnr = resolve_bufnr(bufnr)
+	local bufnr = api.nvim_get_current_buf()
 	do
-		local win = find_window_by_var(hover_window_tag, bufnr)
+		local win = find_window_by_var(method, bufnr)
 		if win then
-			api.nvim_set_current_win(win)
-			return
+			return api.nvim_set_current_win(win)
 		end
 	end
-	local params = protocol.make_text_document_position_params()
-	vim.lsp.buf_request(bufnr, 'textDocument/hover', params, function(_, _, result, _)
-		if result == nil or vim.tbl_isempty(result) then
-			return
+	return request(method, params, function(_, _, result, _)
+			-- TODO(ashkan) could show error in preview...
+		local lines, filetype, opts = fn(result)
+		if lines then
+			local _, winnr = util.open_floating_preview(lines, filetype, opts)
+			api.nvim_win_set_var(winnr, method, bufnr)
 		end
+	end)
+end
+
+function M.hover()
+	local params = protocol.make_text_document_position_params()
+	focusable_preview('textDocument/hover', params, function(result)
+		if not (result and result.contents) then return end
 
-		if result.contents ~= nil then
-			local markdown_lines = util.convert_input_to_markdown_lines(result.contents)
-			markdown_lines = util.trim_empty_lines(markdown_lines)
-			if vim.tbl_isempty(markdown_lines) then
-				markdown_lines = { 'No information available' }
-			end
-			local filetype = util.try_trim_markdown_code_blocks(markdown_lines)
-			local _, winnr = util.open_floating_preview(markdown_lines, filetype)
-			api.nvim_win_set_var(winnr, hover_window_tag, bufnr)
+		local markdown_lines = util.convert_input_to_markdown_lines(result.contents)
+		markdown_lines = util.trim_empty_lines(markdown_lines)
+		if vim.tbl_isempty(markdown_lines) then
+			return { 'No information available' }
 		end
+		return markdown_lines, util.try_trim_markdown_code_blocks(markdown_lines)
 	end)
 end
 
-function M.signature_help()
+function M.peek_definition()
+	local params = protocol.make_text_document_position_params()
+	request('textDocument/peekDefinition', params, function(_, _, result, _)
+		if not (result and result[1]) then return end
+		local loc = result[1]
+		local bufnr = vim.uri_to_bufnr(loc.uri) or error("couldn't find file "..tostring(loc.uri))
+		local start = loc.range.start
+		local finish = loc.range["end"]
+		util.open_floating_peek_preview(bufnr, start, finish, { offset_x = 1 })
+		local headbuf = util.open_floating_preview({"Peek:"}, nil, {
+			offset_y = -(finish.line - start.line);
+			width = finish.character - start.character + 2;
+		})
+		-- TODO(ashkan) change highlight group?
+		api.nvim_buf_add_highlight(headbuf, -1, 'Keyword', 0, -1)
+	end)
+end
+
+
+local function update_tagstack()
+  local bufnr = api.nvim_get_current_buf()
+  local line = vfn.line('.')
+  local col = vfn.col('.')
+  local tagname = vfn.expand('<cWORD>')
+  local item = { bufnr = bufnr, from = { bufnr, line, col, 0 }, tagname = tagname }
+  local winid = vfn.win_getid()
+  local tagstack = vfn.gettagstack(winid)
+  local action
+  if tagstack.length == tagstack.curidx then
+    action = 'r'
+    tagstack.items[tagstack.curidx] = item
+  elseif tagstack.length > tagstack.curidx then
+    action = 'r'
+    if tagstack.curidx > 1 then
+      tagstack.items = table.insert(tagstack.items[tagstack.curidx - 1], item)
+    else
+      tagstack.items = { item }
+    end
+  else
+    action = 'a'
+    tagstack.items = { item }
+  end
+  tagstack.curidx = tagstack.curidx + 1
+  vfn.settagstack(winid, tagstack, action)
+end
+local function handle_location(result)
+  -- We can sometimes get a list of locations, so set the first value as the
+  -- only value we want to handle
+  -- TODO(ashkan) was this correct^? We could use location lists.
+  if result[1] ~= nil then
+    result = result[1]
+  end
+  if result.uri == nil then
+    api.nvim_err_writeln('[LSP] Could not find a valid location')
+    return
+  end
+  local result_file = vim.uri_to_fname(result.uri)
+  local bufnr = vfn.bufadd(result_file)
+  update_tagstack()
+  api.nvim_set_current_buf(bufnr)
+  local start = result.range.start
+  api.nvim_win_set_cursor(0, {start.line + 1, start.character})
+  return true
+end
+local function location_callback(_, method, result)
+  if result == nil or vim.tbl_isempty(result) then
+    local _ = log.info() and log.info(method, 'No location found')
+    return nil
+  end
+  return handle_location(result)
 end
 
 function M.declaration()
+	local params = protocol.make_text_document_position_params()
+	request('textDocument/declaration', params, location_callback)
+end
+
+function M.definition()
+	local params = protocol.make_text_document_position_params()
+	request('textDocument/definition', params, location_callback)
 end
 
 function M.type_definition()
+	local params = protocol.make_text_document_position_params()
+	request('textDocument/typeDefinition', params, location_callback)
 end
 
 function M.implementation()
+	local params = protocol.make_text_document_position_params()
+	request('textDocument/implementation', params, location_callback)
+end
+
+function M.signature_help()
+	local params = protocol.make_text_document_position_params()
+	request('textDocument/signatureHelp', params, location_callback)
 end
 
 -- TODO(ashkan) ?
-function M.completion()
+function M.completion(context)
+	local params = protocol.make_text_document_position_params()
+	params.context = context
+	return request('textDocument/completion', params, function(_, _, result)
+		if vim.tbl_isempty(result or {}) then return end
+		local row, col = unpack(api.nvim_win_get_cursor(0))
+		local line = assert(api.nvim_buf_get_lines(0, row-1, row, false)[1])
+		local line_to_cursor = line:sub(col+1)
+
+		local matches = util.text_document_completion_list_to_complete_items(result, line_to_cursor)
+		vim.fn.complete(col, matches)
+	end)
 end
 
 function M.range_formatting()
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 707e2d0d3b..13c83fefd6 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -261,32 +261,27 @@ function M.open_floating_preview(contents, filetype, opts)
     filetype = { filetype, 's', true };
     opts = { opts, 't', true };
   }
-
-  -- Don't modify our inputs.
-  contents = vim.deepcopy(contents)
+  opts = opts or {}
 
   -- Trim empty lines from the end.
-  for i = #contents, 1, -1 do
-    if #contents[i] == 0 then
-      table.remove(contents)
-    else
-      break
+  contents = M.trim_empty_lines(contents)
+
+  local width = opts.width
+  local height = opts.height or #contents
+  if not width then
+    width = 0
+    for i, line in ipairs(contents) do
+      -- Clean up the input and add left pad.
+      line = " "..line:gsub("\r", "")
+      -- TODO(ashkan) use nvim_strdisplaywidth if/when that is introduced.
+      local line_width = vim.fn.strdisplaywidth(line)
+      width = math.max(line_width, width)
+      contents[i] = line
     end
+    -- Add right padding of 1 each.
+    width = width + 1
   end
 
-  local width = 0
-  local height = #contents
-  for i, line in ipairs(contents) do
-    -- Clean up the input and add left pad.
-    line = " "..line:gsub("\r", "")
-    -- TODO(ashkan) use nvim_strdisplaywidth if/when that is introduced.
-    local line_width = vim.fn.strdisplaywidth(line)
-    width = math.max(line_width, width)
-    contents[i] = line
-  end
-  -- Add right padding of 1 each.
-  width = width + 1
-
   local floating_bufnr = api.nvim_create_buf(false, true)
   if filetype then
     api.nvim_buf_set_option(floating_bufnr, 'filetype', filetype)
@@ -556,5 +551,56 @@ function M.buf_loclist(bufnr, locations)
   vim.fn.setloclist(targetwin, items, ' ', 'Language Server')
 end
 
+-- Remove empty lines from the beginning and end.
+function M.trim_empty_lines(lines)
+  local result = {}
+  local start = 1
+  for i = 1, #lines do
+    if #lines[i] > 0 then
+      start = i
+      break
+    end
+  end
+  local finish = 1
+  for i = #lines, 1, -1 do
+    if #lines[i] > 0 then
+      finish = i
+      break
+    end
+  end
+  -- TODO(ashkan) use tbl_slice.
+  for i = start, finish do
+    table.insert(result, lines[i])
+  end
+  return result
+end
+
+-- Accepts markdown lines and tries to reduce it to a filetype if it is
+-- just a single code block.
+-- Note: This modifies the input.
+--
+-- Returns: filetype or 'markdown' if it was unchanged.
+function M.try_trim_markdown_code_blocks(lines)
+  local language_id = lines[1]:match("^```(.*)")
+  if language_id then
+    local has_inner_code_fence = false
+    for i = 2, (#lines - 1) do
+      local line = lines[i]
+      if line:sub(1,3) == '```' then
+        has_inner_code_fence = true
+        break
+      end
+    end
+    -- No inner code fences + starting with code fence = hooray.
+    if not has_inner_code_fence then
+      table.remove(lines, 1)
+      table.remove(lines)
+      return language_id
+    end
+  end
+  return 'markdown'
+end
+
+
 return M
 -- vim:sw=2 ts=2 et
-- 
cgit 


From a4b7004f489030d9ee7e3bbfc156ab540744279b Mon Sep 17 00:00:00 2001
From: Ashkan Kiani <ashkan.k.kiani@gmail.com>
Date: Wed, 20 Nov 2019 16:03:32 -0800
Subject: Move everything to buf & default_callbacks

- Rename builtin_callbacks to default_callbacks and slightly change its
semantics:
  - No longer contains the default implementations. Instead, any
  default_callbacks will be used in preference for our .buf methods.
  - Add this to the docs.
---
 runtime/lua/vim/lsp.lua                   | 137 +-----------
 runtime/lua/vim/lsp/buf.lua               |  86 +++++++-
 runtime/lua/vim/lsp/builtin_callbacks.lua | 344 ------------------------------
 runtime/lua/vim/lsp/default_callbacks.lua |  57 +++++
 runtime/lua/vim/lsp/protocol.lua          |   1 -
 5 files changed, 147 insertions(+), 478 deletions(-)
 delete mode 100644 runtime/lua/vim/lsp/builtin_callbacks.lua
 create mode 100644 runtime/lua/vim/lsp/default_callbacks.lua

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 4724ff0281..44909a85ee 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1,4 +1,4 @@
-local builtin_callbacks = require 'vim.lsp.builtin_callbacks'
+local default_callbacks = require 'vim.lsp.default_callbacks'
 local log = require 'vim.lsp.log'
 local lsp_rpc = require 'vim.lsp.rpc'
 local protocol = require 'vim.lsp.protocol'
@@ -12,7 +12,8 @@ local validate = vim.validate
 
 local lsp = {
   protocol = protocol;
-  builtin_callbacks = builtin_callbacks;
+  default_callbacks = default_callbacks;
+  buf = require'vim.lsp.buf';
   util = util;
   -- Allow raw RPC access.
   rpc = lsp_rpc;
@@ -283,7 +284,7 @@ function lsp.start_client(config)
 
   local client_id = next_client_id()
 
-  local callbacks = tbl_extend("keep", config.callbacks or {}, builtin_callbacks)
+  local callbacks = tbl_extend("keep", config.callbacks or {}, default_callbacks)
   -- Copy metatable if it has one.
   if config.callbacks and config.callbacks.__metatable then
     setmetatable(callbacks, getmetatable(config.callbacks))
@@ -869,134 +870,8 @@ function lsp.omnifunc(findstart, base)
   end
 end
 
----
---- FileType based configuration utility
----
-
-local all_filetype_configs = {}
-
--- Lookup a filetype config client by its name.
-function lsp.get_filetype_client_by_name(name)
-  local config = all_filetype_configs[name]
-  if config.client_id then
-    return active_clients[config.client_id]
-  end
-end
-
-local function start_filetype_config(config)
-  config.client_id = lsp.start_client(config)
-  nvim_command(string.format(
-    "autocmd FileType %s silent lua vim.lsp.buf_attach_client(0, %d)",
-    table.concat(config.filetypes, ','),
-    config.client_id))
-  return config.client_id
-end
-
--- Easy configuration option for common LSP use-cases.
--- This will lazy initialize the client when the filetypes specified are
--- encountered and attach to those buffers.
---
--- The configuration options are the same as |vim.lsp.start_client()|, but
--- with a few additions and distinctions:
---
--- Additional parameters:
--- - filetype: {string} or {list} of filetypes to attach to.
--- - name: A unique string among all other servers configured with
--- |vim.lsp.add_filetype_config|.
---
--- Differences:
--- - root_dir: will default to |getcwd()|
---
-function lsp.add_filetype_config(config)
-  -- Additional defaults.
-  -- Keep a copy of the user's input for debugging reasons.
-  local user_config = config
-  config = tbl_extend("force", {}, user_config)
-  config.root_dir = config.root_dir or uv.cwd()
-  -- Validate config.
-  validate_client_config(config)
-  validate {
-    name = { config.name, 's' };
-  }
-  assert(config.filetype, "config must have 'filetype' key")
-
-  local filetypes
-  if type(config.filetype) == 'string' then
-    filetypes = { config.filetype }
-  elseif type(config.filetype) == 'table' then
-    filetypes = config.filetype
-    assert(not tbl_isempty(filetypes), "config.filetype must not be an empty table")
-  else
-    error("config.filetype must be a string or a list of strings")
-  end
-
-  if all_filetype_configs[config.name] then
-    -- If the client exists, then it is likely that they are doing some kind of
-    -- reload flow, so let's not throw an error here.
-    if all_filetype_configs[config.name].client_id then
-      -- TODO log here? It might be unnecessarily annoying.
-      return
-    end
-    error(string.format('A configuration with the name %q already exists. They must be unique', config.name))
-  end
-
-  all_filetype_configs[config.name] = tbl_extend("keep", config, {
-    client_id = nil;
-    filetypes = filetypes;
-    user_config = user_config;
-  })
-
-  nvim_command(string.format(
-    "autocmd FileType %s ++once silent lua vim.lsp._start_filetype_config_client(%q)",
-    table.concat(filetypes, ','),
-    config.name))
-end
-
--- Create a copy of an existing configuration, and override config with values
--- from new_config.
--- This is useful if you wish you create multiple LSPs with different root_dirs
--- or other use cases.
---
--- You can specify a new unique name, but if you do not, a unique name will be
--- created like `name-dup_count`.
---
--- existing_name: the name of the existing config to copy.
--- new_config: the new configuration options. @see |vim.lsp.start_client()|.
--- @returns string the new name.
-function lsp.copy_filetype_config(existing_name, new_config)
-  local config = all_filetype_configs[existing_name]
-      or error(string.format("Configuration with name %q doesn't exist", existing_name))
-  config = tbl_extend("force", config, new_config or {})
-  config.client_id = nil
-  config.original_config_name = existing_name
-
-  -- If the user didn't rename it, we will.
-  if config.name == existing_name then
-    -- Create a new, unique name.
-    local duplicate_count = 0
-    for _, conf in pairs(all_filetype_configs) do
-      if conf.original_config_name == existing_name then
-        duplicate_count = duplicate_count + 1
-      end
-    end
-    config.name = string.format("%s-%d", existing_name, duplicate_count + 1)
-  end
-  print("New config name:", config.name)
-  lsp.add_filetype_config(config)
-  return config.name
-end
-
--- Autocmd handler to actually start the client when an applicable filetype is
--- encountered.
-function lsp._start_filetype_config_client(name)
-  local config = all_filetype_configs[name]
-  -- If it exists and is running, don't make it again.
-  if config.client_id and active_clients[config.client_id] then
-    -- TODO log here?
-    return
-  end
-  lsp.buf_attach_client(0, start_filetype_config(config))
-  return config.client_id
+function lsp.client_is_stopped(client_id)
+  return active_clients[client_id] == nil
 end
 
 ---
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 5f54196dcc..e8a38aa6ef 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -33,7 +33,7 @@ end
 
 local function request(method, params, callback)
 	--	TODO(ashkan) enable this.
-	--	callback = vim.lsp.default_callback[method] or callback
+	--	callback = vim.lsp.default_callbacks[method] or callback
 	validate {
 		method = {method, 's'};
 		callback = {callback, 'f'};
@@ -172,9 +172,78 @@ function M.implementation()
 	request('textDocument/implementation', params, location_callback)
 end
 
+--- Convert SignatureHelp response to preview contents.
+-- https://microsoft.github.io/language-server-protocol/specifications/specification-3-14/#textDocument_signatureHelp
+local function signature_help_to_preview_contents(input)
+  if not input.signatures then
+    return
+  end
+  --The active signature. If omitted or the value lies outside the range of
+  --`signatures` the value defaults to zero or is ignored if `signatures.length
+  --=== 0`. Whenever possible implementors should make an active decision about
+  --the active signature and shouldn't rely on a default value.
+  local contents = {}
+  local active_signature = input.activeSignature or 0
+  -- If the activeSignature is not inside the valid range, then clip it.
+  if active_signature >= #input.signatures then
+    active_signature = 0
+  end
+  local signature = input.signatures[active_signature + 1]
+  if not signature then
+    return
+  end
+  vim.list_extend(contents, split_lines(signature.label))
+  if signature.documentation then
+    util.convert_input_to_markdown_lines(signature.documentation, contents)
+  end
+  if input.parameters then
+    local active_parameter = input.activeParameter or 0
+    -- If the activeParameter is not inside the valid range, then clip it.
+    if active_parameter >= #input.parameters then
+      active_parameter = 0
+    end
+    local parameter = signature.parameters and signature.parameters[active_parameter]
+    if parameter then
+      --[=[
+      --Represents a parameter of a callable-signature. A parameter can
+      --have a label and a doc-comment.
+      interface ParameterInformation {
+        --The label of this parameter information.
+        --
+        --Either a string or an inclusive start and exclusive end offsets within its containing
+        --signature label. (see SignatureInformation.label). The offsets are based on a UTF-16
+        --string representation as `Position` and `Range` does.
+        --
+        --*Note*: a label of type string should be a substring of its containing signature label.
+        --Its intended use case is to highlight the parameter label part in the `SignatureInformation.label`.
+        label: string | [number, number];
+        --The human-readable doc-comment of this parameter. Will be shown
+        --in the UI but can be omitted.
+        documentation?: string | MarkupContent;
+      }
+      --]=]
+      -- TODO highlight parameter
+      if parameter.documentation then
+        util.convert_input_to_markdown_lines(parameter.documentation, contents)
+      end
+    end
+  end
+  return contents
+end
+
 function M.signature_help()
 	local params = protocol.make_text_document_position_params()
-	request('textDocument/signatureHelp', params, location_callback)
+	focusable_preview('textDocument/signatureHelp', params, function(result)
+		if not (result and result.signatures and result.signatures[1]) then return end
+
+		-- TODO show empty popup when signatures is empty?
+		local lines = signature_help_to_preview_contents(result)
+		lines = util.trim_empty_lines(lines)
+		if vim.tbl_isempty(lines) then
+			return { 'No signature available' }
+		end
+		return lines, util.try_trim_markdown_code_blocks(lines)
+	end)
 end
 
 -- TODO(ashkan) ?
@@ -195,4 +264,17 @@ end
 function M.range_formatting()
 end
 
+function M.rename(new_name)
+	-- TODO(ashkan) use prepareRename
+	-- * result: [`Range`](#range) \| `{ range: Range, placeholder: string }` \| `null` describing the range of the string to rename and optionally a placeholder text of the string content to be renamed. If `null` is returned then it is deemed that a 'textDocument/rename' request is not valid at the given position.
+	local params = protocol.make_text_document_position_params()
+	new_name = new_name or npcall(vfn.input, "New Name: ")
+	if not (new_name and #new_name > 0) then return end
+	params.newName = new_name
+	request('textDocument/rename', params, function(_, _, result)
+		if not result then return end
+		util.workspace_apply_workspace_edit(result)
+	end)
+end
+
 return M
diff --git a/runtime/lua/vim/lsp/builtin_callbacks.lua b/runtime/lua/vim/lsp/builtin_callbacks.lua
deleted file mode 100644
index 2229547f20..0000000000
--- a/runtime/lua/vim/lsp/builtin_callbacks.lua
+++ /dev/null
@@ -1,344 +0,0 @@
---- Implements the following default callbacks:
---
--- vim.api.nvim_buf_set_lines(0, 0, 0, false, vim.tbl_keys(vim.lsp.builtin_callbacks))
---
-
--- textDocument/completion
--- textDocument/declaration
--- textDocument/definition
--- textDocument/hover
--- textDocument/implementation
--- textDocument/publishDiagnostics
--- textDocument/rename
--- textDocument/signatureHelp
--- textDocument/typeDefinition
--- TODO codeLens/resolve
--- TODO completionItem/resolve
--- TODO documentLink/resolve
--- TODO textDocument/codeAction
--- TODO textDocument/codeLens
--- TODO textDocument/documentHighlight
--- TODO textDocument/documentLink
--- TODO textDocument/documentSymbol
--- TODO textDocument/formatting
--- TODO textDocument/onTypeFormatting
--- TODO textDocument/rangeFormatting
--- TODO textDocument/references
--- window/logMessage
--- window/showMessage
-
-local log = require 'vim.lsp.log'
-local protocol = require 'vim.lsp.protocol'
-local util = require 'vim.lsp.util'
-local api = vim.api
-
-local function split_lines(value)
-  return vim.split(value, '\n', true)
-end
-
-local builtin_callbacks = {}
-
--- textDocument/completion
--- https://microsoft.github.io/language-server-protocol/specification#textDocument_completion
-builtin_callbacks['textDocument/completion'] = function(_, _, result)
-  if not result or vim.tbl_isempty(result) then
-    return
-  end
-  local pos = api.nvim_win_get_cursor(0)
-  local row, col = pos[1], pos[2]
-  local line = assert(api.nvim_buf_get_lines(0, row-1, row, false)[1])
-  local line_to_cursor = line:sub(col+1)
-
-  local matches = util.text_document_completion_list_to_complete_items(result, line_to_cursor)
-  local match_result = vim.fn.matchstrpos(line_to_cursor, '\\k\\+$')
-  local match_start, match_finish = match_result[2], match_result[3]
-
-  vim.fn.complete(col + 1 - (match_finish - match_start), matches)
-end
-
--- textDocument/rename
-builtin_callbacks['textDocument/rename'] = function(_, _, result)
-  if not result then return end
-  util.workspace_apply_workspace_edit(result)
-end
-
-builtin_callbacks['textDocument/publishDiagnostics'] = function(_, _, result)
-  if not result then return end
-  local uri = result.uri
-  local bufnr = vim.uri_to_bufnr(uri)
-  if not bufnr then
-    api.nvim_err_writeln(string.format("LSP.publishDiagnostics: Couldn't find buffer for %s", uri))
-    return
-  end
-  util.buf_clear_diagnostics(bufnr)
-  util.buf_diagnostics_save_positions(bufnr, result.diagnostics)
-  util.buf_diagnostics_underline(bufnr, result.diagnostics)
-  util.buf_diagnostics_virtual_text(bufnr, result.diagnostics)
-  -- util.buf_loclist(bufnr, result.diagnostics)
-end
-
-local function focusable_popup()
-  local popup_win
-  return function(winnr)
-    if popup_win and api.nvim_win_is_valid(popup_win) then
-      if api.nvim_get_current_win() == popup_win then
-        api.nvim_command("wincmd p")
-      else
-        api.nvim_set_current_win(popup_win)
-      end
-      return
-    end
-    popup_win = winnr
-  end
-end
-
-local hover_popup = focusable_popup()
-
-local function trim_empty_lines(lines)
-  local result = {}
-  for _, line in ipairs(lines) do
-    if #line > 0 then
-      table.insert(result, line)
-    end
-  end
-  return result
-end
-
--- Accepts markdown lines and tries to reduce it to a filetype if it is
--- just a single code block.
-local function try_trim_code_blocks(lines)
-  local language_id = lines[1]:match("^```(.*)")
-  if language_id then
-    local has_inner_code_fence = false
-    for i = 2, (#lines - 1) do
-      local line = lines[i]
-      if line:sub(1,3) == '```' then
-        has_inner_code_fence = true
-        break
-      end
-    end
-    -- No inner code fences + starting with code fence = hooray.
-    if not has_inner_code_fence then
-      table.remove(lines, 1)
-      table.remove(lines)
-      return lines, language_id
-    end
-  end
-  return lines, 'markdown'
-end
-
--- textDocument/hover
--- https://microsoft.github.io/language-server-protocol/specification#textDocument_hover
--- @params MarkedString | MarkedString[] | MarkupContent
-builtin_callbacks['textDocument/hover'] = function(_, _, result)
-  if result == nil or vim.tbl_isempty(result) then
-    return
-  end
-
-  if result.contents ~= nil then
-    local markdown_lines = util.convert_input_to_markdown_lines(result.contents)
-    markdown_lines = trim_empty_lines(markdown_lines)
-    if vim.tbl_isempty(markdown_lines) then
-      markdown_lines = { 'No information available' }
-    end
-    local _, winnr = util.open_floating_preview(try_trim_code_blocks(markdown_lines))
-    hover_popup(winnr)
-  end
-end
-
-builtin_callbacks['textDocument/peekDefinition'] = function(_, _, result)
-  if result == nil or vim.tbl_isempty(result) then return end
-  -- TODO(ashkan) what to do with multiple locations?
-  result = result[1]
-  local bufnr = vim.uri_to_bufnr(result.uri)
-  assert(bufnr)
-  local start = result.range.start
-  local finish = result.range["end"]
-  util.open_floating_peek_preview(bufnr, start, finish, { offset_x = 1 })
-  util.open_floating_preview({"*Peek:*", string.rep(" ", finish.character - start.character + 1) }, 'markdown', { offset_y = -(finish.line - start.line) })
-end
-
---- Convert SignatureHelp response to preview contents.
--- https://microsoft.github.io/language-server-protocol/specifications/specification-3-14/#textDocument_signatureHelp
-local function signature_help_to_preview_contents(input)
-  if not input.signatures then
-    return
-  end
-  --The active signature. If omitted or the value lies outside the range of
-  --`signatures` the value defaults to zero or is ignored if `signatures.length
-  --=== 0`. Whenever possible implementors should make an active decision about
-  --the active signature and shouldn't rely on a default value.
-  local contents = {}
-  local active_signature = input.activeSignature or 0
-  -- If the activeSignature is not inside the valid range, then clip it.
-  if active_signature >= #input.signatures then
-    active_signature = 0
-  end
-  local signature = input.signatures[active_signature + 1]
-  if not signature then
-    return
-  end
-  vim.list_extend(contents, split_lines(signature.label))
-  if signature.documentation then
-    util.convert_input_to_markdown_lines(signature.documentation, contents)
-  end
-  if input.parameters then
-    local active_parameter = input.activeParameter or 0
-    -- If the activeParameter is not inside the valid range, then clip it.
-    if active_parameter >= #input.parameters then
-      active_parameter = 0
-    end
-    local parameter = signature.parameters and signature.parameters[active_parameter]
-    if parameter then
-      --[=[
-      --Represents a parameter of a callable-signature. A parameter can
-      --have a label and a doc-comment.
-      interface ParameterInformation {
-        --The label of this parameter information.
-        --
-        --Either a string or an inclusive start and exclusive end offsets within its containing
-        --signature label. (see SignatureInformation.label). The offsets are based on a UTF-16
-        --string representation as `Position` and `Range` does.
-        --
-        --*Note*: a label of type string should be a substring of its containing signature label.
-        --Its intended use case is to highlight the parameter label part in the `SignatureInformation.label`.
-        label: string | [number, number];
-        --The human-readable doc-comment of this parameter. Will be shown
-        --in the UI but can be omitted.
-        documentation?: string | MarkupContent;
-      }
-      --]=]
-      -- TODO highlight parameter
-      if parameter.documentation then
-        util.convert_input_to_markdown_lines(parameter.documentation, contents)
-      end
-    end
-  end
-  return contents
-end
-
--- textDocument/signatureHelp
--- https://microsoft.github.io/language-server-protocol/specification#textDocument_signatureHelp
-builtin_callbacks['textDocument/signatureHelp'] = function(_, _, result)
-  if result == nil or vim.tbl_isempty(result) then
-    return
-  end
-
-  -- TODO show empty popup when signatures is empty?
-  if #result.signatures > 0 then
-    local markdown_lines = signature_help_to_preview_contents(result)
-    if vim.tbl_isempty(markdown_lines) then
-      markdown_lines = { 'No signature available' }
-    end
-    util.open_floating_preview(markdown_lines, 'markdown')
-  end
-end
-
-local function update_tagstack()
-  local bufnr = api.nvim_get_current_buf()
-  local line = vim.fn.line('.')
-  local col = vim.fn.col('.')
-  local tagname = vim.fn.expand('<cWORD>')
-  local item = { bufnr = bufnr, from = { bufnr, line, col, 0 }, tagname = tagname }
-  local winid = vim.fn.win_getid()
-  local tagstack = vim.fn.gettagstack(winid)
-
-  local action
-
-  if tagstack.length == tagstack.curidx then
-    action = 'r'
-    tagstack.items[tagstack.curidx] = item
-  elseif tagstack.length > tagstack.curidx then
-    action = 'r'
-    if tagstack.curidx > 1 then
-      tagstack.items = table.insert(tagstack.items[tagstack.curidx - 1], item)
-    else
-      tagstack.items = { item }
-    end
-  else
-    action = 'a'
-    tagstack.items = { item }
-  end
-
-  tagstack.curidx = tagstack.curidx + 1
-  vim.fn.settagstack(winid, tagstack, action)
-end
-
-local function handle_location(result)
-  -- We can sometimes get a list of locations, so set the first value as the
-  -- only value we want to handle
-  -- TODO(ashkan) was this correct^? We could use location lists.
-  if result[1] ~= nil then
-    result = result[1]
-  end
-  if result.uri == nil then
-    api.nvim_err_writeln('[LSP] Could not find a valid location')
-    return
-  end
-  local result_file = vim.uri_to_fname(result.uri)
-  local bufnr = vim.fn.bufadd(result_file)
-  update_tagstack()
-  api.nvim_set_current_buf(bufnr)
-  local start = result.range.start
-  api.nvim_win_set_cursor(0, {start.line + 1, start.character})
-end
-
-local function location_callback(_, method, result)
-  if result == nil or vim.tbl_isempty(result) then
-    local _ = log.info() and log.info(method, 'No location found')
-    return nil
-  end
-  handle_location(result)
-  return true
-end
-
-local location_callbacks = {
-  -- https://microsoft.github.io/language-server-protocol/specification#textDocument_declaration
-  'textDocument/declaration';
-  -- https://microsoft.github.io/language-server-protocol/specification#textDocument_definition
-  'textDocument/definition';
-  -- https://microsoft.github.io/language-server-protocol/specification#textDocument_implementation
-  'textDocument/implementation';
-  -- https://microsoft.github.io/language-server-protocol/specification#textDocument_typeDefinition
-  'textDocument/typeDefinition';
-}
-
-for _, location_method in ipairs(location_callbacks) do
-  builtin_callbacks[location_method] = location_callback
-end
-
-local function log_message(_, _, result, client_id)
-  local message_type = result.type
-  local message = result.message
-  local client = vim.lsp.get_client_by_id(client_id)
-  local client_name = client and client.name or string.format("id=%d", client_id)
-  if not client then
-    api.nvim_err_writeln(string.format("LSP[%s] client has shut down after sending the message", client_name))
-  end
-  if message_type == protocol.MessageType.Error then
-    -- Might want to not use err_writeln,
-    -- but displaying a message with red highlights or something
-    api.nvim_err_writeln(string.format("LSP[%s] %s", client_name, message))
-  else
-    local message_type_name = protocol.MessageType[message_type]
-    api.nvim_out_write(string.format("LSP[%s][%s] %s\n", client_name, message_type_name, message))
-  end
-  return result
-end
-
-builtin_callbacks['window/showMessage'] = log_message
-builtin_callbacks['window/logMessage'] = log_message
-
--- Add boilerplate error validation and logging for all of these.
-for k, fn in pairs(builtin_callbacks) do
-  builtin_callbacks[k] = function(err, method, params, client_id)
-    local _ = log.debug() and log.debug('builtin_callback', method, { params = params, client_id = client_id, err = err })
-    if err then
-      error(tostring(err))
-    end
-    return fn(err, method, params, client_id)
-  end
-end
-
-return builtin_callbacks
--- vim:sw=2 ts=2 et
diff --git a/runtime/lua/vim/lsp/default_callbacks.lua b/runtime/lua/vim/lsp/default_callbacks.lua
new file mode 100644
index 0000000000..63e62075b4
--- /dev/null
+++ b/runtime/lua/vim/lsp/default_callbacks.lua
@@ -0,0 +1,57 @@
+local log = require 'vim.lsp.log'
+local protocol = require 'vim.lsp.protocol'
+local util = require 'vim.lsp.util'
+local api = vim.api
+
+local M = {}
+
+M['textDocument/publishDiagnostics'] = function(_, _, result)
+  if not result then return end
+  local uri = result.uri
+  local bufnr = vim.uri_to_bufnr(uri)
+  if not bufnr then
+    api.nvim_err_writeln(string.format("LSP.publishDiagnostics: Couldn't find buffer for %s", uri))
+    return
+  end
+  util.buf_clear_diagnostics(bufnr)
+  util.buf_diagnostics_save_positions(bufnr, result.diagnostics)
+  util.buf_diagnostics_underline(bufnr, result.diagnostics)
+  util.buf_diagnostics_virtual_text(bufnr, result.diagnostics)
+  -- util.buf_loclist(bufnr, result.diagnostics)
+end
+
+local function log_message(_, _, result, client_id)
+  local message_type = result.type
+  local message = result.message
+  local client = vim.lsp.get_client_by_id(client_id)
+  local client_name = client and client.name or string.format("id=%d", client_id)
+  if not client then
+    api.nvim_err_writeln(string.format("LSP[%s] client has shut down after sending the message", client_name))
+  end
+  if message_type == protocol.MessageType.Error then
+    -- Might want to not use err_writeln,
+    -- but displaying a message with red highlights or something
+    api.nvim_err_writeln(string.format("LSP[%s] %s", client_name, message))
+  else
+    local message_type_name = protocol.MessageType[message_type]
+    api.nvim_out_write(string.format("LSP[%s][%s] %s\n", client_name, message_type_name, message))
+  end
+  return result
+end
+
+M['window/showMessage'] = log_message
+M['window/logMessage'] = log_message
+
+-- Add boilerplate error validation and logging for all of these.
+for k, fn in pairs(M) do
+  M[k] = function(err, method, params, client_id)
+    local _ = log.debug() and log.debug('default_callback', method, { params = params, client_id = client_id, err = err })
+    if err then
+      error(tostring(err))
+    end
+    return fn(err, method, params, client_id)
+  end
+end
+
+return M
+-- vim:sw=2 ts=2 et
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 1413a88ce2..1f51e7bef7 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -10,7 +10,6 @@ end
 
 --[=[
 -- Useful for interfacing with:
--- https://github.com/microsoft/language-server-protocol/blob/gh-pages/_specifications/specification-3-14.md
 -- https://github.com/microsoft/language-server-protocol/raw/gh-pages/_specifications/specification-3-14.md
 function transform_schema_comments()
   nvim.command [[silent! '<,'>g/\/\*\*\|\*\/\|^$/d]]
-- 
cgit 


From 03eb88848c2bea6c0c1da7acc97754d6f47b5118 Mon Sep 17 00:00:00 2001
From: Ashkan Kiani <ashkan.k.kiani@gmail.com>
Date: Wed, 20 Nov 2019 16:09:03 -0800
Subject: Change callback resolution to be dynamic.

This allows default_callbacks to be specified after client creation to
be considered. Also it simplifies the code.
---
 runtime/lua/vim/lsp.lua | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 44909a85ee..a284dd1ee7 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -284,19 +284,19 @@ function lsp.start_client(config)
 
   local client_id = next_client_id()
 
-  local callbacks = tbl_extend("keep", config.callbacks or {}, default_callbacks)
-  -- Copy metatable if it has one.
-  if config.callbacks and config.callbacks.__metatable then
-    setmetatable(callbacks, getmetatable(config.callbacks))
-  end
+  local callbacks = config.callbacks or {}
   local name = config.name or tostring(client_id)
   local log_prefix = string.format("LSP[%s]", name)
 
   local handlers = {}
 
+  local function resolve_callback(method)
+    return callbacks[method] or default_callbacks[method]
+  end
+
   function handlers.notification(method, params)
     local _ = log.debug() and log.debug('notification', method, params)
-    local callback = callbacks[method]
+    local callback = resolve_callback(method)
     if callback then
       -- Method name is provided here for convenience.
       callback(nil, method, params, client_id)
@@ -305,7 +305,7 @@ function lsp.start_client(config)
 
   function handlers.server_request(method, params)
     local _ = log.debug() and log.debug('server_request', method, params)
-    local callback = callbacks[method]
+    local callback = resolve_callback(method)
     if callback then
       local _ = log.debug() and log.debug("server_request: found callback for", method)
       return callback(nil, method, params, client_id)
@@ -316,7 +316,8 @@ function lsp.start_client(config)
 
   function handlers.on_error(code, err)
     local _ = log.error() and log.error(log_prefix, "on_error", { code = lsp.client_errors[code], err = err })
-    nvim_err_writeln(string.format('%s: Error %s: %q', log_prefix, lsp.client_errors[code], vim.inspect(err)))
+    print(string.format('%s: Error %s: %q', log_prefix, lsp.client_errors[code], vim.inspect(err)))
+--    nvim_err_writeln(string.format('%s: Error %s: %q', log_prefix, lsp.client_errors[code], vim.inspect(err)))
     if config.on_error then
       local status, usererr = pcall(config.on_error, code, err)
       if not status then
@@ -440,7 +441,7 @@ function lsp.start_client(config)
   --- Checks capabilities before rpc.request-ing.
   function client.request(method, params, callback)
     if not callback then
-      callback = client.callbacks[method]
+      callback = resolve_callback(method)
         or error(string.format("request callback is empty and no default was found for client %s", client.name))
     end
     local _ = log.debug() and log.debug(log_prefix, "client.request", client_id, method, params, callback)
-- 
cgit 


From c40f8600d2418dfdfeacbba3efe11ae7c6c70ad3 Mon Sep 17 00:00:00 2001
From: Ashkan Kiani <ashkan.k.kiani@gmail.com>
Date: Wed, 20 Nov 2019 16:16:13 -0800
Subject: Change error writer to not be annoying.

---
 runtime/lua/vim/lsp.lua     | 12 ++++++++----
 runtime/lua/vim/lsp/buf.lua |  7 ++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index a284dd1ee7..1b9d788c43 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -27,6 +27,11 @@ local lsp = {
 -- TODO consider whether 'eol' or 'fixeol' should change the nvim_buf_get_lines that send.
 -- TODO improve handling of scratch buffers with LSP attached.
 
+local function err_message(...)
+  nvim_err_writeln(table.concat(vim.tbl_flatten{...}))
+  nvim_command("redraw")
+end
+
 local function resolve_bufnr(bufnr)
   validate { bufnr = { bufnr, 'n', true } }
   if bufnr == nil or bufnr == 0 then
@@ -316,13 +321,12 @@ function lsp.start_client(config)
 
   function handlers.on_error(code, err)
     local _ = log.error() and log.error(log_prefix, "on_error", { code = lsp.client_errors[code], err = err })
-    print(string.format('%s: Error %s: %q', log_prefix, lsp.client_errors[code], vim.inspect(err)))
---    nvim_err_writeln(string.format('%s: Error %s: %q', log_prefix, lsp.client_errors[code], vim.inspect(err)))
+    err_message(log_prefix, ': Error ', lsp.client_errors[code], ': ', vim.inspect(err))
     if config.on_error then
       local status, usererr = pcall(config.on_error, code, err)
       if not status then
         local _ = log.error() and log.error(log_prefix, "user on_error failed", { err = usererr })
-        nvim_err_writeln(log_prefix.." user on_error failed: "..tostring(usererr))
+        err_message(log_prefix, ' user on_error failed: ', tostring(usererr))
       end
     end
   end
@@ -434,7 +438,7 @@ function lsp.start_client(config)
   local function unsupported_method(method)
     local msg = "server doesn't support "..method
     local _ = log.warn() and log.warn(msg)
-    nvim_err_writeln(msg)
+    err_message(msg)
     return lsp.rpc_response_error(protocol.ErrorCodes.MethodNotFound, msg)
   end
 
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index e8a38aa6ef..ff045cbbfc 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -23,6 +23,11 @@ local function npcall(fn, ...)
 	return ok_or_nil(pcall(fn, ...))
 end
 
+local function err_message(...)
+  api.nvim_err_writeln(table.concat(vim.tbl_flatten{...}))
+  api.nvim_command("redraw")
+end
+
 local function find_window_by_var(name, value)
 	for _, win in ipairs(api.nvim_list_wins()) do
 		if npcall(api.nvim_win_get_var, win, name) == value then
@@ -133,7 +138,7 @@ local function handle_location(result)
     result = result[1]
   end
   if result.uri == nil then
-    api.nvim_err_writeln('[LSP] Could not find a valid location')
+    err_message('[LSP] Could not find a valid location')
     return
   end
   local result_file = vim.uri_to_fname(result.uri)
-- 
cgit 


From 1e16b3cf281bec73ccbd155dd11b2db048d1219a Mon Sep 17 00:00:00 2001
From: Ashkan Kiani <ashkan.k.kiani@gmail.com>
Date: Wed, 20 Nov 2019 16:16:36 -0800
Subject: Spaces not tabs.

---
 runtime/lua/vim/lsp/buf.lua | 201 ++++++++++++++++++++++----------------------
 1 file changed, 101 insertions(+), 100 deletions(-)

(limited to 'runtime/lua/vim')

diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index ff045cbbfc..8b21370800 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -16,11 +16,11 @@ local function resolve_bufnr(bufnr)
 end
 
 local function ok_or_nil(status, ...)
-	if not status then return end
-	return ...
+  if not status then return end
+  return ...
 end
 local function npcall(fn, ...)
-	return ok_or_nil(pcall(fn, ...))
+  return ok_or_nil(pcall(fn, ...))
 end
 
 local function err_message(...)
@@ -29,78 +29,78 @@ local function err_message(...)
 end
 
 local function find_window_by_var(name, value)
-	for _, win in ipairs(api.nvim_list_wins()) do
-		if npcall(api.nvim_win_get_var, win, name) == value then
-			return win
-		end
-	end
+  for _, win in ipairs(api.nvim_list_wins()) do
+    if npcall(api.nvim_win_get_var, win, name) == value then
+      return win
+    end
+  end
 end
 
 local function request(method, params, callback)
-	--	TODO(ashkan) enable this.
-	--	callback = vim.lsp.default_callbacks[method] or callback
-	validate {
-		method = {method, 's'};
-		callback = {callback, 'f'};
-	}
-	return vim.lsp.buf_request(0, method, params, function(err, _, result, client_id)
-		if err then error(tostring(err)) end
-		return callback(err, method, result, client_id)
-	end)
+  --  TODO(ashkan) enable this.
+  --  callback = vim.lsp.default_callbacks[method] or callback
+  validate {
+    method = {method, 's'};
+    callback = {callback, 'f'};
+  }
+  return vim.lsp.buf_request(0, method, params, function(err, _, result, client_id)
+    if err then error(tostring(err)) end
+    return callback(err, method, result, client_id)
+  end)
 end
 
 local function focusable_preview(method, params, fn)
-	if npcall(api.nvim_win_get_var, 0, method) then
-		return api.nvim_command("wincmd p")
-	end
+  if npcall(api.nvim_win_get_var, 0, method) then
+    return api.nvim_command("wincmd p")
+  end
 
-	local bufnr = api.nvim_get_current_buf()
-	do
-		local win = find_window_by_var(method, bufnr)
-		if win then
-			return api.nvim_set_current_win(win)
-		end
-	end
-	return request(method, params, function(_, _, result, _)
-			-- TODO(ashkan) could show error in preview...
-		local lines, filetype, opts = fn(result)
-		if lines then
-			local _, winnr = util.open_floating_preview(lines, filetype, opts)
-			api.nvim_win_set_var(winnr, method, bufnr)
-		end
-	end)
+  local bufnr = api.nvim_get_current_buf()
+  do
+    local win = find_window_by_var(method, bufnr)
+    if win then
+      return api.nvim_set_current_win(win)
+    end
+  end
+  return request(method, params, function(_, _, result, _)
+      -- TODO(ashkan) could show error in preview...
+    local lines, filetype, opts = fn(result)
+    if lines then
+      local _, winnr = util.open_floating_preview(lines, filetype, opts)
+      api.nvim_win_set_var(winnr, method, bufnr)
+    end
+  end)
 end
 
 function M.hover()
-	local params = protocol.make_text_document_position_params()
-	focusable_preview('textDocument/hover', params, function(result)
-		if not (result and result.contents) then return end
+  local params = protocol.make_text_document_position_params()
+  focusable_preview('textDocument/hover', params, function(result)
+    if not (result and result.contents) then return end
 
-		local markdown_lines = util.convert_input_to_markdown_lines(result.contents)
-		markdown_lines = util.trim_empty_lines(markdown_lines)
-		if vim.tbl_isempty(markdown_lines) then
-			return { 'No information available' }
-		end
-		return markdown_lines, util.try_trim_markdown_code_blocks(markdown_lines)
-	end)
+    local markdown_lines = util.convert_input_to_markdown_lines(result.contents)
+    markdown_lines = util.trim_empty_lines(markdown_lines)
+    if vim.tbl_isempty(markdown_lines) then
+      return { 'No information available' }
+    end
+    return markdown_lines, util.try_trim_markdown_code_blocks(markdown_lines)
+  end)
 end
 
 function M.peek_definition()
-	local params = protocol.make_text_document_position_params()
-	request('textDocument/peekDefinition', params, function(_, _, result, _)
-		if not (result and result[1]) then return end
-		local loc = result[1]
-		local bufnr = vim.uri_to_bufnr(loc.uri) or error("couldn't find file "..tostring(loc.uri))
-		local start = loc.range.start
-		local finish = loc.range["end"]
-		util.open_floating_peek_preview(bufnr, start, finish, { offset_x = 1 })
-		local headbuf = util.open_floating_preview({"Peek:"}, nil, {
-			offset_y = -(finish.line - start.line);
-			width = finish.character - start.character + 2;
-		})
-		-- TODO(ashkan) change highlight group?
-		api.nvim_buf_add_highlight(headbuf, -1, 'Keyword', 0, -1)
-	end)
+  local params = protocol.make_text_document_position_params()
+  request('textDocument/peekDefinition', params, function(_, _, result, _)
+    if not (result and result[1]) then return end
+    local loc = result[1]
+    local bufnr = vim.uri_to_bufnr(loc.uri) or error("couldn't find file "..tostring(loc.uri))
+    local start = loc.range.start
+    local finish = loc.range["end"]
+    util.open_floating_peek_preview(bufnr, start, finish, { offset_x = 1 })
+    local headbuf = util.open_floating_preview({"Peek:"}, nil, {
+      offset_y = -(finish.line - start.line);
+      width = finish.character - start.character + 2;
+    })
+    -- TODO(ashkan) change highlight group?
+    api.nvim_buf_add_highlight(headbuf, -1, 'Keyword', 0, -1)
+  end)
 end
 
 
@@ -158,23 +158,23 @@ local function location_callback(_, method, result)
 end
 
 function M.declaration()
-	local params = protocol.make_text_document_position_params()
-	request('textDocument/declaration', params, location_callback)
+  local params = protocol.make_text_document_position_params()
+  request('textDocument/declaration', params, location_callback)
 end
 
 function M.definition()
-	local params = protocol.make_text_document_position_params()
-	request('textDocument/definition', params, location_callback)
+  local params = protocol.make_text_document_position_params()
+  request('textDocument/definition', params, location_callback)
 end
 
 function M.type_definition()
-	local params = protocol.make_text_document_position_params()
-	request('textDocument/typeDefinition', params, location_callback)
+  local params = protocol.make_text_document_position_params()
+  request('textDocument/typeDefinition', params, location_callback)
 end
 
 function M.implementation()
-	local params = protocol.make_text_document_position_params()
-	request('textDocument/implementation', params, location_callback)
+  local params = protocol.make_text_document_position_params()
+  request('textDocument/implementation', params, location_callback)
 end
 
 --- Convert SignatureHelp response to preview contents.
@@ -237,49 +237,50 @@ local function signature_help_to_preview_contents(input)
 end
 
 function M.signature_help()
-	local params = protocol.make_text_document_position_params()
-	focusable_preview('textDocument/signatureHelp', params, function(result)
-		if not (result and result.signatures and result.signatures[1]) then return end
+  local params = protocol.make_text_document_position_params()
+  focusable_preview('textDocument/signatureHelp', params, function(result)
+    if not (result and result.signatures and result.signatures[1]) then return end
 
-		-- TODO show empty popup when signatures is empty?
-		local lines = signature_help_to_preview_contents(result)
-		lines = util.trim_empty_lines(lines)
-		if vim.tbl_isempty(lines) then
-			return { 'No signature available' }
-		end
-		return lines, util.try_trim_markdown_code_blocks(lines)
-	end)
+    -- TODO show empty popup when signatures is empty?
+    local lines = signature_help_to_preview_contents(result)
+    lines = util.trim_empty_lines(lines)
+    if vim.tbl_isempty(lines) then
+      return { 'No signature available' }
+    end
+    return lines, util.try_trim_markdown_code_blocks(lines)
+  end)
 end
 
 -- TODO(ashkan) ?
 function M.completion(context)
-	local params = protocol.make_text_document_position_params()
-	params.context = context
-	return request('textDocument/completion', params, function(_, _, result)
-		if vim.tbl_isempty(result or {}) then return end
-		local row, col = unpack(api.nvim_win_get_cursor(0))
-		local line = assert(api.nvim_buf_get_lines(0, row-1, row, false)[1])
-		local line_to_cursor = line:sub(col+1)
+  local params = protocol.make_text_document_position_params()
+  params.context = context
+  return request('textDocument/completion', params, function(_, _, result)
+    if vim.tbl_isempty(result or {}) then return end
+    local row, col = unpack(api.nvim_win_get_cursor(0))
+    local line = assert(api.nvim_buf_get_lines(0, row-1, row, false)[1])
+    local line_to_cursor = line:sub(col+1)
 
-		local matches = util.text_document_completion_list_to_complete_items(result, line_to_cursor)
-		vim.fn.complete(col, matches)
-	end)
+    local matches = util.text_document_completion_list_to_complete_items(result, line_to_cursor)
+    vim.fn.complete(col, matches)
+  end)
 end
 
 function M.range_formatting()
 end
 
 function M.rename(new_name)
-	-- TODO(ashkan) use prepareRename
-	-- * result: [`Range`](#range) \| `{ range: Range, placeholder: string }` \| `null` describing the range of the string to rename and optionally a placeholder text of the string content to be renamed. If `null` is returned then it is deemed that a 'textDocument/rename' request is not valid at the given position.
-	local params = protocol.make_text_document_position_params()
-	new_name = new_name or npcall(vfn.input, "New Name: ")
-	if not (new_name and #new_name > 0) then return end
-	params.newName = new_name
-	request('textDocument/rename', params, function(_, _, result)
-		if not result