fix: move opts.diff to display.diff

My my own rules this should trigger v4 of the plugin...however because
this initial change was less than 24 hours ago, I'm going to let myself
slide...

Author: olimorris

README.md

@@ -836,6 +836,13 @@ Use Markdown formatting and include the programming language name at the start o
       width = 95,
       height = 10,
     },
+    diff = {
+      enabled = true,
+      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" },
+      provider = "default", -- default
+    },
     chat = {
       window = {
         layout = "vertical", -- float|vertical|horizontal|buffer
@@ -877,14 +884,6 @@ Use Markdown formatting and include the programming language name at the start o
   opts = {
     log_level = "ERROR", -- TRACE|DEBUG|ERROR|INFO
 
-    diff = {
-      enabled = true,
-      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" },
-      provider = "default", -- default
-    },
-
     -- If this is false then any default prompt that is marked as containing code
     -- will not be sent to the LLM. Please note that whilst I have made every
     -- effort to ensure no code leakage, using this is at your own risk

doc/codecompanion.txt

@@ -1,4 +1,4 @@
-*codecompanion.txt*       For NVIM v0.9.2       Last change: 2024 September 16
+*codecompanion.txt*       For NVIM v0.9.2       Last change: 2024 September 17
 
 ==============================================================================
 Table of Contents                            *codecompanion-table-of-contents*
@@ -577,6 +577,8 @@ The plugin fires many events during its lifecycle:
 - `CodeCompanionInlineFinished` - Fired at the end of the Inline strategy
 - `CodeCompanionRequestStarted` - Fired at the start of any API request
 - `CodeCompanionRequestFinished` - Fired at the end of any API request
+- `CodeCompanionDiffAttached` - Fired when in Diff mode
+- `CodeCompanionDiffDetached` - Fired when exiting Diff mode
 
 
   [!TIP] Some events are sent with a data payload which can be leveraged.

lua/codecompanion/config.lua

@@ -602,6 +602,13 @@ Use Markdown formatting and include the programming language name at the start o
       width = 95,
       height = 10,
     },
+    diff = {
+      enabled = true,
+      close_chat_at = 240, -- Close an open chat buffer if the total columns of your display are less than...
+      layout = "vertical", -- vertical|horizontal split for default provider
+      opts = { "internal", "filler", "closeoff", "algorithm:patience", "followwrap", "linematch:120" },
+      provider = "default", -- default|mini_diff
+    },
     chat = {
       window = {
         layout = "vertical", -- float|vertical|horizontal|buffer
@@ -643,14 +650,6 @@ Use Markdown formatting and include the programming language name at the start o
   opts = {
     log_level = "ERROR", -- TRACE|DEBUG|ERROR|INFO
 
-    diff = {
-      enabled = true,
-      close_chat_at = 240, -- Close an open chat buffer if the total columns of your display are less than...
-      layout = "vertical", -- vertical|horizontal split for default provider
-      opts = { "internal", "filler", "closeoff", "algorithm:patience", "followwrap", "linematch:120" },
-      provider = "default", -- default|mini_diff
-    },
-
     -- If this is false then any default prompt that is marked as containing code
     -- will not be sent to the LLM. Please note that whilst I have made every
     -- effort to ensure no code leakage, using this is at your own risk

lua/codecompanion/helpers/diff/default.lua

@@ -42,16 +42,16 @@ function Diff.new(args)
   local wrap = vim.wo.wrap
   local linebreak = vim.wo.linebreak
   local breakindent = vim.wo.breakindent
-  vim.cmd("set diffopt=" .. table.concat(config.opts.diff.opts, ","))
+  vim.cmd("set diffopt=" .. table.concat(config.display.diff.opts, ","))
 
   --- Minimize the chat buffer window if there's not enough screen estate
   local last_chat = require("codecompanion").last_chat()
-  if last_chat and last_chat:is_visible() and config.opts.diff.close_chat_at > vim.o.columns then
+  if last_chat and last_chat:is_visible() and config.display.diff.close_chat_at > vim.o.columns then
     last_chat:hide()
   end
 
   -- Create the diff buffer
-  if config.opts.diff.layout == "vertical" then
+  if config.display.diff.layout == "vertical" then
     vim.cmd("vsplit")
   else
     vim.cmd("split")

lua/codecompanion/helpers/tools/editor.lua

@@ -19,9 +19,9 @@ return {
       local lines = vim.split(action.code, "\n", { plain = true, trimempty = false })
 
       -- Diff the buffer
-      if config.opts.diff.enabled then
+      if config.display.diff.enabled then
         local ok
-        local provider = config.opts.diff.provider
+        local provider = config.display.diff.provider
         ok, diff = pcall(require, "codecompanion.helpers.diff." .. provider)
 
         if ok then

lua/codecompanion/strategies/inline.lua

@@ -561,11 +561,11 @@ end
 ---Start the diff process
 ---@return nil
 function Inline:start_diff()
-  if config.opts.diff.enabled == false then
+  if config.display.diff.enabled == false then
     return
   end
 
-  local provider = config.opts.diff.provider
+  local provider = config.display.diff.provider
   local ok, diff = pcall(require, "codecompanion.helpers.diff." .. provider)
   if not ok then
     return log:error("Diff provider not found: %s", provider)