refactor: better config options

README.md

@@ -127,23 +127,27 @@ require("codecompanion").setup({
     chat = { -- Options for the chat strategy
       type = "float", -- float|buffer
       show_settings = false, -- Show the model settings in the chat window
-      float = { -- Options for the floating window
+      show_token_count = true, -- Show the token count for the current chat?
+      buf_options = { -- Buffer options for the chat buffer
+        buflisted = false,
+      },
+      float_options = { -- Float window options if the type is "float"
         border = "single",
         buflisted = false,
         max_height = 0,
         max_width = 0,
         padding = 1,
       },
-    },
-    win_options = { -- Options for the chat buffer
-      cursorcolumn = false,
-      cursorline = false,
-      foldcolumn = "0",
-      linebreak = true,
-      list = false,
-      signcolumn = "no",
-      spell = false,
-      wrap = true,
+      win_options = { -- Window options for the chat buffer
+        cursorcolumn = false,
+        cursorline = false,
+        foldcolumn = "0",
+        linebreak = true,
+        list = false,
+        signcolumn = "no",
+        spell = false,
+        wrap = true,
+      },
     },
   },
   keymaps = {
@@ -158,7 +162,6 @@ require("codecompanion").setup({
   },
   log_level = "ERROR", -- TRACE|DEBUG|ERROR
   send_code = true, -- Send code context to the API?
-  show_token_count = true, -- Show the token count for the current chat?
   silence_notifications = false, -- Silence notifications for actions like saving conversations?
   use_default_actions = true, -- Use the default actions in the action palette?
 })

doc/codecompanion.txt

@@ -102,23 +102,27 @@ Click to see the default configuration ~
         chat = { -- Options for the chat strategy
           type = "float", -- float|buffer
           show_settings = false, -- Show the model settings in the chat window
-          float = { -- Options for the floating window
+          show_token_count = true, -- Show the token count for the current chat?
+          buf_options = { -- Buffer options for the chat buffer
+            buflisted = false,
+          },
+          float_options = { -- Float window options if the type is "float"
             border = "single",
             buflisted = false,
             max_height = 0,
             max_width = 0,
             padding = 1,
           },
-        },
-        win_options = { -- Options for the chat buffer
-          cursorcolumn = false,
-          cursorline = false,
-          foldcolumn = "0",
-          linebreak = true,
-          list = false,
-          signcolumn = "no",
-          spell = false,
-          wrap = true,
+          win_options = { -- Window options for the chat buffer
+            cursorcolumn = false,
+            cursorline = false,
+            foldcolumn = "0",
+            linebreak = true,
+            list = false,
+            signcolumn = "no",
+            spell = false,
+            wrap = true,
+          },
         },
       },
       keymaps = {
@@ -133,7 +137,6 @@ Click to see the default configuration ~
       },
       log_level = "ERROR", -- TRACE|DEBUG|ERROR
       send_code = true, -- Send code context to the API?
-      show_token_count = true, -- Show the token count for the current chat?
       silence_notifications = false, -- Silence notifications for actions like saving conversations?
       use_default_actions = true, -- Use the default actions in the action palette?
     })

lua/codecompanion/actions.lua

@@ -88,16 +88,14 @@ M.static.actions = {
             callback = function()
               _G.codecompanion_chats[bufnr] = nil
 
-              local winid = 0
               if config.options.display.chat.type == "float" then
-                winid = ui.open_float(bufnr, {
-                  display = config.options.display.chat.float,
+                ui.open_float(bufnr, {
+                  display = config.options.display.chat.float_options,
                 })
               else
                 vim.api.nvim_set_current_buf(bufnr)
               end
 
-              ui.set_options(config.options.display.win_options, winid)
               ui.buf_scroll_to_end(bufnr)
             end,
           })

lua/codecompanion/config.lua

@@ -30,23 +30,26 @@ local defaults = {
     chat = {
       type = "float",
       show_settings = false,
-      float = {
-        border = "single",
+      show_token_count = true,
+      buf_options = {
         buflisted = false,
+      },
+      float_options = {
+        border = "single",
         max_height = 0,
         max_width = 0,
         padding = 1,
       },
-    },
-    win_options = {
-      cursorcolumn = false,
-      cursorline = false,
-      foldcolumn = "0",
-      linebreak = true,
-      list = false,
-      signcolumn = "no",
-      spell = false,
-      wrap = true,
+      win_options = {
+        cursorcolumn = false,
+        cursorline = false,
+        foldcolumn = "0",
+        linebreak = true,
+        list = false,
+        signcolumn = "no",
+        spell = false,
+        wrap = true,
+      },
     },
   },
   keymaps = {
@@ -61,7 +64,6 @@ local defaults = {
   },
   log_level = "ERROR",
   send_code = true,
-  show_token_count = true,
   silence_notifications = false,
   use_default_actions = true,
 }

lua/codecompanion/init.lua

@@ -57,7 +57,7 @@ M.toggle = function()
     if action == "show" then
       if config.options.display.chat.type == "float" then
         ui.open_float(buf, {
-          display = config.options.display.chat.float,
+          display = config.options.display.chat.float_options,
         })
       else
         vim.cmd("buffer " .. buf)
@@ -67,7 +67,7 @@ M.toggle = function()
         vim.cmd("hide")
       else
         -- Show the previous buffer
-        vim.cmd("buffer " .. vim.fn.buf("#"))
+        vim.cmd("buffer " .. vim.fn.bufnr("#"))
       end
     end
   end

lua/codecompanion/strategy/chat.lua

@@ -143,7 +143,7 @@ local function render_messages(bufnr, settings, messages, context)
 end
 
 local display_tokens = function(bufnr)
-  if config.options.show_token_count then
+  if config.options.display.chat.show_token_count then
     require("codecompanion.utils.tokens").display_tokens(bufnr)
   end
 end
@@ -354,6 +354,8 @@ function Chat.new(args)
   api.nvim_buf_set_option(bufnr, "syntax", "markdown")
   vim.b[bufnr].codecompanion_type = "chat"
 
+  ui.set_buf_options(bufnr, config.options.display.chat.buf_options)
+
   watch_cursor()
   chat_autocmds(bufnr, args)
 
@@ -378,15 +380,15 @@ function Chat.new(args)
 
   if config.options.display.chat.type == "float" then
     winid = ui.open_float(bufnr, {
-      display = config.options.display.chat.float,
+      display = config.options.display.chat.float_options,
     })
   end
 
   if config.options.display.chat.type == "buffer" and args.show_buffer then
     api.nvim_set_current_buf(bufnr)
   end
 
-  ui.set_options(config.options.display.win_options, winid)
+  ui.set_win_options(winid, config.options.display.chat.win_options)
   vim.cmd("setlocal formatoptions-=t")
   ui.buf_scroll_to_end(bufnr)
 

lua/codecompanion/utils/ui.lua

@@ -129,14 +129,22 @@ function M.selector(items, opts)
   end)
 end
 
----@param opts table
 ---@param winid number
-function M.set_options(opts, winid)
+---@param opts table
+function M.set_win_options(winid, opts)
   for k, v in pairs(opts) do
     api.nvim_set_option_value(k, v, { scope = "local", win = winid })
   end
 end
 
+---@param bufnr number
+---@param opts table
+function M.set_buf_options(bufnr, opts)
+  for k, v in pairs(opts) do
+    api.nvim_buf_set_option(bufnr, k, v)
+  end
+end
+
 ---@param bufnr number
 ---@param opts table
 function M.open_float(bufnr, opts)