Merge branch 'main' into version-3

Author: olimorris

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.7.0](https://github.com/olimorris/codecompanion.nvim/compare/v2.6.6...v2.7.0) (2024-09-13)
+
+
+### Features
+
+* add mini.diff as option for inline diffs ([#210](https://github.com/olimorris/codecompanion.nvim/issues/210)) ([a33d4ae](https://github.com/olimorris/codecompanion.nvim/commit/a33d4aefbf3d4cc21c23dcbcfc27b61fb6b26245))
+
 ## [2.6.6](https://github.com/olimorris/codecompanion.nvim/compare/v2.6.5...v2.6.6) (2024-09-11)
 
 

README.md

@@ -20,7 +20,7 @@ New features are always announced <a href="https://github.com/olimorris/codecomp
 Thank you to the following people:
 
 <p align="center">
-<!-- coffee --><a href="https://github.com/bassamsdata"><img src="https://github.com/bassamsdata.png" width="60px" alt="Bassam Data" /></a><a href="https://github.com/ivo-toby"><img src="https://github.com/ivo-toby.png" width="60px" alt="Ivo Toby" /></a><a href="https://github.com/KTSCode"><img src="https://github.com/KTSCode.png" width="60px" alt="KTS Code" /></a><!-- coffee --><!-- sponsors --><a href="https://github.com/mtmr0x"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5414299?u&#x3D;b60f401c665a5aecd45bf4a5c79f7fced0e85b6d&amp;v&#x3D;4" width="60px" alt="Matheus Marsiglio" /></a><a href="https://github.com/unicell"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;35352?u&#x3D;1de708f9084ea3ea710294a38694414af4c6ed53&amp;v&#x3D;4" width="60px" alt="Qiu Yu" /></a><a href="https://github.com/zhming0"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1054703?u&#x3D;b173a2c1afc61fa25d9343704659630406e3dea7&amp;v&#x3D;4" width="60px" alt="Zhiming Guo" /></a><!-- sponsors -->
+<!-- coffee --><a href="https://x.com/luxus"><img src="https://pbs.twimg.com/profile_images/744754093495844864/GwnEJygG_400x400.jpg" width="60px" alt="Luxus" /></a><a href="https://github.com/bassamsdata"><img src="https://github.com/bassamsdata.png" width="60px" alt="Bassam Data" /></a><a href="https://github.com/ivo-toby"><img src="https://github.com/ivo-toby.png" width="60px" alt="Ivo Toby" /></a><a href="https://github.com/KTSCode"><img src="https://github.com/KTSCode.png" width="60px" alt="KTS Code" /></a><!-- coffee --><!-- sponsors --><a href="https://github.com/mtmr0x"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;5414299?u&#x3D;b60f401c665a5aecd45bf4a5c79f7fced0e85b6d&amp;v&#x3D;4" width="60px" alt="Matheus Marsiglio" /></a><a href="https://github.com/unicell"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;35352?u&#x3D;1de708f9084ea3ea710294a38694414af4c6ed53&amp;v&#x3D;4" width="60px" alt="Qiu Yu" /></a><a href="https://github.com/zhming0"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;1054703?u&#x3D;b173a2c1afc61fa25d9343704659630406e3dea7&amp;v&#x3D;4" width="60px" alt="Zhiming Guo" /></a><a href="https://github.com/koskeller"><img src="https:&#x2F;&#x2F;avatars.githubusercontent.com&#x2F;u&#x2F;30801340?u&#x3D;b89bc8fe35246370a30bbe59719c3b32459f4129&amp;v&#x3D;4" width="60px" alt="Konstantin Keller" /></a><!-- sponsors -->
 </p>
 
 <!-- panvimdoc-ignore-end -->
@@ -865,6 +865,8 @@ Use Markdown formatting and include the programming language name at the start o
       layout = "vertical", -- vertical|horizontal|buffer
       diff = {
         enabled = true,
+        -- mini_diff is using inline diff in the same buffer but requires the plugin to be installed: https://github.com/echasnovski/mini.diff
+        diff_method = "default", -- default|mini_diff 
         close_chat_at = 240, -- Close an open chat buffer if the total columns of your display are less than...
         layout = "vertical", -- vertical|horizontal
         opts = { "internal", "filler", "closeoff", "algorithm:patience", "followwrap", "linematch:120" },
@@ -1331,6 +1333,27 @@ require('legendary').setup({
 })
 ```
 
+**Mini.Diff**
+
+if you're using [mini.diff](https://github.com/echasnovski/mini.diff) you can put an icon in the statusline to indicate which diff is used currently, git or llm changes:
+
+```lua
+local function getDiffSource()
+  local buf_id, diff_source, diffIcon
+  buf_id = vim.api.nvim_get_current_buf()
+  diff_source = vim.b[buf_id].diffCompGit
+  if not diff_source then
+    return ""
+  end
+  if diff_source == "git" then
+    diffIcon = "󰊤 "
+  elseif diff_source == "llm" then
+    diffIcon = " "
+  end
+  return string.format("%%#StatusLineLSP#%s", diffIcon)
+end
+```
+
 ## :toolbox: Troubleshooting
 
 Before raising an [issue](https://github.com/olimorris/codecompanion.nvim/issues), there are a number of steps you can take to troubleshoot a problem:

lua/codecompanion/config.lua

@@ -613,6 +613,7 @@ Use Markdown formatting and include the programming language name at the start o
       layout = "vertical", -- vertical|horizontal|buffer
       diff = {
         enabled = true,
+        diff_method = "default", -- default|mini_diff
         close_chat_at = 240, -- Close an open chat buffer if the total columns of your display are less than...
         layout = "vertical", -- vertical|horizontal
         opts = { "internal", "filler", "closeoff", "algorithm:patience", "followwrap", "linematch:120" },

lua/codecompanion/strategies/inline.lua

@@ -4,6 +4,7 @@ local config = require("codecompanion").config
 
 local keymaps = require("codecompanion.utils.keymaps")
 local log = require("codecompanion.utils.log")
+local mini_diff = require("codecompanion.strategies.inline.mini_diff")
 local msg_utils = require("codecompanion.utils.messages")
 local ui = require("codecompanion.utils.ui")
 local util = require("codecompanion.utils.util")
@@ -173,6 +174,13 @@ end
 ---Start the classification of the user's prompt
 ---@param opts? table
 function Inline:start(opts)
+  -- NOTE: we need to add this here to intiate the mini.diff early to be
+  -- working properly
+  if config.display.inline.diff.diff_method == "mini_diff" then
+    log:trace("CodeCompanion: Using mini diff for inline display")
+    require("codecompanion.strategies.inline.mini_diff").setup()
+  end
+
   log:trace("Starting Inline with opts: %s", opts)
 
   if opts and opts[1] then
@@ -562,61 +570,72 @@ function Inline:start_diff()
   if config.display.inline.diff.enabled == false then
     return
   end
+  if config.display.inline.diff.diff_method == "mini_diff" then
+    return -- no need to do anything here, since it's handled in mini_diff.lua
+  else
+    -- Taken from the awesome:
+    -- https://github.com/S1M0N38/dante.nvim
 
-  -- Taken from the awesome:
-  -- https://github.com/S1M0N38/dante.nvim
-
-  -- Get current window properties
-  local wrap = vim.wo.wrap
-  local linebreak = vim.wo.linebreak
-  local breakindent = vim.wo.breakindent
-  vim.cmd("set diffopt=" .. table.concat(config.display.inline.diff.opts, ","))
+    -- Get current window properties
+    local wrap = vim.wo.wrap
+    local linebreak = vim.wo.linebreak
+    local breakindent = vim.wo.breakindent
+    vim.cmd("set diffopt=" .. table.concat(config.display.inline.diff.opts, ","))
 
-  -- Close the chat buffer
-  local last_chat = require("codecompanion").last_chat()
-  if last_chat and last_chat:is_visible() and config.display.inline.diff.close_chat_at > vim.o.columns then
-    last_chat:hide()
-  end
+    -- Close the chat buffer
+    local last_chat = require("codecompanion").last_chat()
+    if last_chat and last_chat:is_visible() and config.display.inline.diff.close_chat_at > vim.o.columns then
+      last_chat:hide()
+    end
 
-  -- Create the diff buffer
-  if config.display.inline.diff.layout == "vertical" then
-    vim.cmd("vsplit")
-  else
-    vim.cmd("split")
+    -- Create the diff buffer
+    if config.display.inline.diff.layout == "vertical" then
+      vim.cmd("vsplit")
+    else
+      vim.cmd("split")
+    end
+    self.diff.winnr = api.nvim_get_current_win()
+    self.diff.bufnr = api.nvim_create_buf(false, true)
+    api.nvim_win_set_buf(self.diff.winnr, self.diff.bufnr)
+    api.nvim_set_option_value("filetype", self.context.filetype, { buf = self.diff.bufnr })
+    api.nvim_set_option_value("wrap", wrap, { win = self.diff.winnr })
+    api.nvim_set_option_value("linebreak", linebreak, { win = self.diff.winnr })
+    api.nvim_set_option_value("breakindent", breakindent, { win = self.diff.winnr })
+
+    -- Set the diff buffer to the contents, prior to any modifications
+    api.nvim_buf_set_lines(self.diff.bufnr, 0, 0, true, self.diff.lines)
+    api.nvim_win_set_cursor(self.diff.winnr, { self.context.cursor_pos[1], self.context.cursor_pos[2] })
+
+    -- Begin diffing
+    api.nvim_set_current_win(self.diff.winnr)
+    vim.cmd("diffthis")
+    api.nvim_set_current_win(self.context.winnr)
+    vim.cmd("diffthis")
   end
-  self.diff.winnr = api.nvim_get_current_win()
-  self.diff.bufnr = api.nvim_create_buf(false, true)
-  api.nvim_win_set_buf(self.diff.winnr, self.diff.bufnr)
-  api.nvim_set_option_value("filetype", self.context.filetype, { buf = self.diff.bufnr })
-  api.nvim_set_option_value("wrap", wrap, { win = self.diff.winnr })
-  api.nvim_set_option_value("linebreak", linebreak, { win = self.diff.winnr })
-  api.nvim_set_option_value("breakindent", breakindent, { win = self.diff.winnr })
-
-  -- Set the diff buffer to the contents, prior to any modifications
-  api.nvim_buf_set_lines(self.diff.bufnr, 0, 0, true, self.diff.lines)
-  api.nvim_win_set_cursor(self.diff.winnr, { self.context.cursor_pos[1], self.context.cursor_pos[2] })
-
-  -- Begin diffing
-  api.nvim_set_current_win(self.diff.winnr)
-  vim.cmd("diffthis")
-  api.nvim_set_current_win(self.context.winnr)
-  vim.cmd("diffthis")
 end
 
 ---Accept the changes in the diff
 ---@return nil
 function Inline:accept()
-  api.nvim_win_close(self.diff.winnr, false)
-  self.diff = {}
+  if config.display.inline.diff.diff_method == "mini_diff" then
+    mini_diff.accept(self.context.bufnr)
+  else
+    api.nvim_win_close(self.diff.winnr, false)
+    self.diff = {}
+  end
 end
 
 ---Reject the changes in the diff
 ---@return nil
 function Inline:reject()
-  vim.cmd("diffoff")
-  api.nvim_win_close(self.diff.winnr, false)
-  api.nvim_buf_set_lines(self.context.bufnr, 0, -1, true, self.diff.lines)
-  self.diff = {}
+  if config.display.inline.diff.diff_method == "mini_diff" then
+    mini_diff.reject(self.context.bufnr)
+  else
+    vim.cmd("diffoff")
+    api.nvim_win_close(self.diff.winnr, false)
+    api.nvim_buf_set_lines(self.context.bufnr, 0, -1, true, self.diff.lines)
+    self.diff = {}
+  end
 end
 
 return Inline