From c83df9e68dd41f5a3f7df5a7048169ee286a7da8 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 25 Sep 2025 15:30:28 +0200
Subject: [PATCH] feat(copilot-native): added experimental support for next
 edit suggestions. check the docs to enable

---
 lua/lazyvim/config/keymaps.lua                |  1 +
 .../plugins/extras/ai/copilot-native.lua      | 68 ++++++++++++++++++-
 lua/lazyvim/util/cmp.lua                      |  1 +
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/config/keymaps.lua b/lua/lazyvim/config/keymaps.lua
index 938a2333..752aa602 100644
--- a/lua/lazyvim/config/keymaps.lua
+++ b/lua/lazyvim/config/keymaps.lua
@@ -49,6 +49,7 @@ map("n", "<leader>bD", "<cmd>:bd<cr>", { desc = "Delete Buffer and Window" })
 map({ "i", "n", "s" }, "<esc>", function()
   vim.cmd("noh")
   LazyVim.cmp.actions.snippet_stop()
+  LazyVim.cmp.actions.ai_stop()
   return "<esc>"
 end, { expr = true, desc = "Escape and Clear hlsearch" })
 
diff --git a/lua/lazyvim/plugins/extras/ai/copilot-native.lua b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
index a4c8005b..b4a61b20 100644
--- a/lua/lazyvim/plugins/extras/ai/copilot-native.lua
+++ b/lua/lazyvim/plugins/extras/ai/copilot-native.lua
@@ -2,6 +2,9 @@
 if lazyvim_docs then
   -- Native inline completions don't support being shown as regular completions
   vim.g.ai_cmp = false
+
+  -- Set to `true` in your `options.lua` to enable experimental support for Next Edit Suggestions
+  vim.g.copilot_nes = false
 end
 
 if LazyVim.has_extra("ai.copilot-native") then
@@ -57,8 +60,41 @@ return {
       setup = {
         copilot = function()
           vim.lsp.inline_completion.enable()
+
+          -- Only trigger NES updates:
+          -- * when leaving insert mode
+          -- * when text is changed (in normal mode)
+          -- * when accepting a next edit suggestion
+          local nes_update = Snacks.util.debounce(function()
+            return vim.g.copilot_nes and require("copilot-lsp.nes").request_nes("copilot")
+          end, { ms = 100 })
+
+          vim.api.nvim_create_autocmd({ "InsertLeave", "TextChanged" }, {
+            group = vim.api.nvim_create_augroup("lazyvim.copilot-native.complete", { clear = true }),
+            callback = nes_update,
+          })
+
+          -- Accept inline suggestions or next edits
           LazyVim.cmp.actions.ai_accept = function()
-            return vim.lsp.inline_completion.get()
+            if vim.b.nes_state then
+              local nes = require("copilot-lsp.nes")
+
+              -- Try to jump to the start of the suggestion edit.
+              if nes.walk_cursor_start_edit() then
+                return true
+              end
+
+              -- apply the pending suggestion and jump to the end of the edit.
+              if nes.apply_pending_nes() then
+                nes.walk_cursor_end_edit()
+                nes_update() -- trigger new nes update after accept
+                return true
+              end
+            end
+            if vim.lsp.inline_completion.get() then
+              -- nes_update() -- ensure nes update is triggered after inline completion
+              return true
+            end
           end
         end,
       },
@@ -81,4 +117,34 @@ return {
       )
     end,
   },
+
+  vim.g.copilot_nes
+      and {
+        "copilotlsp-nvim/copilot-lsp",
+        init = function()
+          vim.api.nvim_create_autocmd("BufEnter", {
+            callback = function(ev)
+              local buf = ev.buf
+              local client = vim.lsp.get_clients({ name = "copilot", bufnr = buf })[1]
+              if not client then
+                return
+              end
+              client:notify("textDocument/didFocus", {
+                textDocument = {
+                  uri = vim.uri_from_bufnr(buf),
+                },
+              })
+            end,
+          })
+
+          LazyVim.cmp.actions.ai_stop = function()
+            require("copilot-lsp.nes").clear()
+          end
+        end,
+        keys = {
+          -- nes is also useful in normal mode
+          { "<tab>", LazyVim.cmp.map({ "ai_accept" }, "<tab>"), mode = { "n" }, expr = true },
+        },
+      }
+    or nil,
 }
diff --git a/lua/lazyvim/util/cmp.lua b/lua/lazyvim/util/cmp.lua
index 0641c892..2637b0d3 100644
--- a/lua/lazyvim/util/cmp.lua
+++ b/lua/lazyvim/util/cmp.lua
@@ -18,6 +18,7 @@ M.actions = {
       vim.snippet.stop()
     end
   end,
+  ai_stop = function() end,
 }
 
 ---@param actions string[]