feat(ui): inline edit

Author: Xuyuanp

lua/copilot-lsp/nes/ui.lua

@@ -36,12 +36,12 @@ function M._calculate_lines(suggestion)
     local deleted_lines_count = suggestion.range["end"].line - suggestion.range.start.line
     local added_lines = vim.split(trim_end(suggestion.newText), "\n")
     local added_lines_count = suggestion.newText == "" and 0 or #added_lines
-    local same_line = 0
+    local same_line = false
 
     if deleted_lines_count == 0 and added_lines_count == 1 then
         ---changing within line
         deleted_lines_count = 1
-        same_line = 1
+        same_line = true
     end
 
     -- if
@@ -87,7 +87,8 @@ end
 ---@param edits copilotlsp.InlineEdit[]
 ---@param ns_id integer
 function M._display_next_suggestion(edits, ns_id)
-    local state = vim.b[vim.api.nvim_get_current_buf()].nes_state
+    local bufnr = vim.api.nvim_get_current_buf()
+    local state = vim.b[bufnr].nes_state
     if state then
         M.clear_suggestion(vim.api.nvim_get_current_buf(), ns_id)
     end
@@ -101,20 +102,55 @@ function M._display_next_suggestion(edits, ns_id)
 
     local lines = M._calculate_lines(suggestion)
 
-    if lines.deleted_lines_count > 0 then
-        -- Deleted range red highlight
-        vim.api.nvim_buf_set_extmark(bufnr, ns_id, lines.delete_extmark.row, 0, {
-            hl_group = "CopilotLspNesDelete",
-            end_row = lines.delete_extmark.end_row,
-        })
+    local line_replacement = false
+    if lines.same_line then
+        local row = suggestion.range.start.line
+        local start_col = suggestion.range.start.character
+        local end_col = suggestion.range["end"].character
+
+        local line_text = vim.api.nvim_buf_get_lines(bufnr, row, row + 1, false)[1]
+        if start_col == 0 and end_col == #line_text then
+            line_replacement = true
+        end
     end
-    if lines.added_lines_count > 0 then
-        local text = trim_end(edits[1].text)
-        local virt_lines = require("copilot-lsp.util").hl_text_to_virt_lines(text, vim.bo[bufnr].filetype)
 
-        vim.api.nvim_buf_set_extmark(bufnr, ns_id, lines.virt_lines_extmark.row, 0, {
-            virt_lines = virt_lines,
-        })
+    if lines.same_line and not line_replacement then
+        local row = suggestion.range.start.line
+        local start_col = suggestion.range.start.character
+        local end_col = suggestion.range["end"].character
+
+        -- inline edit
+        if start_col < end_col then
+            vim.api.nvim_buf_set_extmark(bufnr, ns_id, row, start_col, {
+                hl_group = "CopilotLspNesDelete",
+                end_col = end_col,
+            })
+        end
+        if suggestion.text ~= "" then
+            local virt_lines =
+                require("copilot-lsp.util").hl_text_to_virt_lines(suggestion.text, vim.bo[bufnr].filetype)
+            local virt_text = virt_lines[1]
+            vim.api.nvim_buf_set_extmark(bufnr, ns_id, row, end_col, {
+                virt_text = virt_text,
+                virt_text_pos = "inline",
+            })
+        end
+    else
+        if lines.deleted_lines_count > 0 then
+            -- Deleted range red highlight
+            vim.api.nvim_buf_set_extmark(bufnr, ns_id, lines.delete_extmark.row, 0, {
+                hl_group = "CopilotLspNesDelete",
+                end_row = lines.delete_extmark.end_row,
+            })
+        end
+        if lines.added_lines_count > 0 then
+            local text = trim_end(edits[1].text)
+            local virt_lines = require("copilot-lsp.util").hl_text_to_virt_lines(text, vim.bo[bufnr].filetype)
+
+            vim.api.nvim_buf_set_extmark(bufnr, ns_id, lines.virt_lines_extmark.row, 0, {
+                virt_lines = virt_lines,
+            })
+        end
     end
 
     vim.b[bufnr].nes_state = suggestion

lua/copilot-lsp/types.lua

@@ -26,6 +26,6 @@
 ---@field deleted_lines_count number
 ---@field added_lines string[]
 ---@field added_lines_count number
----@field same_line number
+---@field same_line boolean
 ---@field delete_extmark copilotlsp.nes.DeleteExtmark
 ---@field virt_lines_extmark copilotlsp.nes.AddExtmark

tests/nes/test_ui.lua

@@ -35,7 +35,7 @@ T["diff placement calculations"] = MiniTest.new_set({
                     row = 0,
                 },
                 deleted_lines_count = 1,
-                same_line = 1,
+                same_line = true,
                 virt_lines_extmark = {
                     row = 0,
                     virt_lines_count = 1,
@@ -71,7 +71,7 @@ T["diff placement calculations"] = MiniTest.new_set({
                     row = 0,
                 },
                 deleted_lines_count = 1,
-                same_line = 0,
+                same_line = false,
                 virt_lines_extmark = {
                     row = 0,
                     virt_lines_count = 0,
@@ -107,7 +107,7 @@ T["diff placement calculations"] = MiniTest.new_set({
                     row = 0,
                 },
                 deleted_lines_count = 1,
-                same_line = 0,
+                same_line = false,
                 virt_lines_extmark = {
                     row = 0,
                     virt_lines_count = 2,
@@ -137,7 +137,7 @@ T["diff placement calculations"] = MiniTest.new_set({
                     end_row = 2,
                     row = 2,
                 },
-                same_line = 1,
+                same_line = true,
                 virt_lines_extmark = {
                     row = 1,
                     virt_lines_count = 1,