Merge pull request #14165 from mjlbach/feature/lsp_preview_location_syntax

lsp: set syntax instead of filetype for preview location highlighting

runtime/doc/lsp.txt

@@ -1586,6 +1586,12 @@ convert_signature_help_to_markdown_lines({signature_help})
                 See also: ~
                     https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_signatureHelp
 
+create_file({change})                             *vim.lsp.util.create_file()*
+                TODO: Documentation
+
+delete_file({change})                             *vim.lsp.util.delete_file()*
+                TODO: Documentation
+
                                      *vim.lsp.util.extract_completion_items()*
 extract_completion_items({result})
                 Can be used to extract the completion items from a `textDocument/completion` request, which may return one of `CompletionItem[]` , `CompletionList` or null.
@@ -1793,12 +1799,12 @@ make_workspace_params({added}, {removed})
                     {removed}
 
                                         *vim.lsp.util.open_floating_preview()*
-open_floating_preview({contents}, {filetype}, {opts})
+open_floating_preview({contents}, {syntax}, {opts})
                 Shows contents in a floating window.
 
                 Parameters: ~
                     {contents}  table of lines to show in window
-                    {filetype}  string of filetype to set for opened buffer
+                    {syntax}    string of syntax to set for opened buffer
                     {opts}      dictionary with optional fields
 
                 Return: ~
@@ -1829,6 +1835,10 @@ preview_location({location})                 *vim.lsp.util.preview_location()*
                     (bufnr,winnr) buffer and window number of floating window
                     or nil
 
+rename({old_fname}, {new_fname}, {opts})               *vim.lsp.util.rename()*
+                Parameters: ~
+                    {opts}  (table)
+
 set_lines({lines}, {A}, {B}, {new_lines})           *vim.lsp.util.set_lines()*
                 Replaces text in a range with new text.
 

runtime/lua/vim/lsp/util.lua

@@ -911,8 +911,8 @@ function M.preview_location(location)
   end
   local range = location.targetRange or location.range
   local contents = api.nvim_buf_get_lines(bufnr, range.start.line, range["end"].line+1, false)
-  local filetype = api.nvim_buf_get_option(bufnr, 'filetype')
+  local syntax = api.nvim_buf_get_option(bufnr, 'syntax')
-  return M.open_floating_preview(contents, filetype)
+  return M.open_floating_preview(contents, syntax)
 end
 
 --@private
@@ -1201,7 +1201,7 @@ end
 --- Shows contents in a floating window.
 ---
 --@param contents table of lines to show in window
---@param filetype string of filetype to set for opened buffer
+--@param syntax string of syntax to set for opened buffer
 --@param opts dictionary with optional fields
 --             - height    of floating window
 --             - width     of floating window
@@ -1214,10 +1214,10 @@ end
 --             - pad_bottom number of lines to pad contents at bottom
 --@returns bufnr,winnr buffer and window number of the newly created floating
 ---preview window
-function M.open_floating_preview(contents, filetype, opts)
+function M.open_floating_preview(contents, syntax, opts)
   validate {
     contents = { contents, 't' };
-    filetype = { filetype, 's', true };
+    syntax = { syntax, 's', true };
     opts = { opts, 't', true };
   }
   opts = opts or {}
@@ -1230,12 +1230,12 @@ function M.open_floating_preview(contents, filetype, opts)
   local width, height = M._make_floating_popup_size(contents, opts)
 
   local floating_bufnr = api.nvim_create_buf(false, true)
-  if filetype then
+  if syntax then
-    api.nvim_buf_set_option(floating_bufnr, 'filetype', filetype)
+    api.nvim_buf_set_option(floating_bufnr, 'syntax', syntax)
   end
   local float_option = M.make_floating_popup_options(width, height, opts)
   local floating_winnr = api.nvim_open_win(floating_bufnr, false, float_option)
-  if filetype == 'markdown' then
+  if syntax == 'markdown' then
     api.nvim_win_set_option(floating_winnr, 'conceallevel', 2)
   end
   api.nvim_buf_set_lines(floating_bufnr, 0, -1, true, contents)