Skip to content

Commit 715fd87

Browse files
committed
fix(nes): adjust float positioning
1 parent 05568ff commit 715fd87

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

lua/copilot-lsp/nes/ui.lua

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,31 @@ function M._display_next_suggestion(edits, ns_id)
3838
local ui = {}
3939
local deleted_lines_count = suggestion.range["end"].line - suggestion.range.start.line
4040
local added_lines = vim.split(suggestion.newText, "\n")
41-
local added_lines_count = suggestion.newText == "" and 0 or #added_lines - 1
41+
local added_lines_count = suggestion.newText == "" and 0 or #added_lines
4242
local same_line = 0
4343

44-
if deleted_lines_count == 0 and added_lines_count == 0 then
44+
if deleted_lines_count == 0 and added_lines_count == 1 then
4545
---changing within line
4646
deleted_lines_count = 1
47-
added_lines_count = 1
4847
same_line = 1
49-
added_lines = { suggestion.newText }
5048
end
5149

5250
if deleted_lines_count > 0 then
51+
-- Deleted range red highlight
5352
vim.api.nvim_buf_set_extmark(bufnr, ns_id, suggestion.range.start.line, 0, {
5453
hl_group = "NesDelete",
5554
end_row = suggestion.range["end"].line + 1,
5655
})
5756
end
5857
if added_lines_count > 0 then
58+
-- Create space for float
5959
local virt_lines = {}
6060
for _ = 1, added_lines_count do
6161
table.insert(virt_lines, {
6262
{ "", "Normal" },
6363
})
6464
end
65-
local line = suggestion.range.start.line + deleted_lines_count - 1 + same_line
66-
67-
vim.api.nvim_buf_set_extmark(bufnr, ns_id, line, 0, {
65+
vim.api.nvim_buf_set_extmark(bufnr, ns_id, suggestion.range["end"].line, 0, {
6866
virt_lines = virt_lines,
6967
})
7068

@@ -81,8 +79,8 @@ function M._display_next_suggestion(edits, ns_id)
8179
local preview_winnr = vim.api.nvim_open_win(preview_bufnr, false, {
8280
relative = "cursor",
8381
width = win_width - offset,
84-
height = (#added_lines + same_line) - 1,
85-
row = (suggestion.range["end"].line + same_line) - cursor[1] + 1,
82+
height = #added_lines,
83+
row = (suggestion.range["end"].line + deleted_lines_count + 1) - cursor[1],
8684
col = 0,
8785
style = "minimal",
8886
border = "none",

0 commit comments

Comments
 (0)