kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): send buffer contents joined on fileformat-specific linebreak (#16334)

Browse Source
This commit is contained in:
Dmytro Meleshko 2021-11-21 19:03:45 +02:00 committed by GitHub
parent a2749482d9
commit 134a6385e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
runtime/lua/vim/lsp.lua
View File

@ -115,6 +115,13 @@ local format_line_ending = {
["mac"] = '\r', ["mac"] = '\r',
} }
---@private
---@param bufnr (number)
---@returns (string)
local function buf_get_line_ending(bufnr)
return format_line_ending[nvim_buf_get_option(bufnr, 'fileformat')] or '\n'
end
local client_index = 0 local client_index = 0
---@private ---@private
--- Returns a new, unused client id. --- Returns a new, unused client id.
@ -277,9 +284,10 @@ end
---@param bufnr (number) Buffer handle, or 0 for current. ---@param bufnr (number) Buffer handle, or 0 for current.
---@returns Buffer text as string. ---@returns Buffer text as string.
local function buf_get_full_text(bufnr) local function buf_get_full_text(bufnr)
local text = table.concat(nvim_buf_get_lines(bufnr, 0, -1, true), '\n') local line_ending = buf_get_line_ending(bufnr)
local text = table.concat(nvim_buf_get_lines(bufnr, 0, -1, true), line_ending)
if nvim_buf_get_option(bufnr, 'eol') then if nvim_buf_get_option(bufnr, 'eol') then
text = text .. '\n' text = text .. line_ending
end end
return text return text
end end
@ -361,9 +369,9 @@ do
local incremental_changes = function(client) local incremental_changes = function(client)
local cached_buffers = state_by_client[client.id].buffers local cached_buffers = state_by_client[client.id].buffers
local curr_lines = nvim_buf_get_lines(bufnr, 0, -1, true) local curr_lines = nvim_buf_get_lines(bufnr, 0, -1, true)
local line_ending = format_line_ending[vim.api.nvim_buf_get_option(0, 'fileformat')] local line_ending = buf_get_line_ending(bufnr)
local incremental_change = sync.compute_diff( local incremental_change = sync.compute_diff(
cached_buffers[bufnr], curr_lines, firstline, lastline, new_lastline, client.offset_encoding or 'utf-16', line_ending or '\n') cached_buffers[bufnr], curr_lines, firstline, lastline, new_lastline, client.offset_encoding or 'utf-16', line_ending)
cached_buffers[bufnr] = curr_lines cached_buffers[bufnr] = curr_lines
return incremental_change return incremental_change
end end