fix(chat): olimorris#783 display settings in chat buffer (olimorris#784)

Co-authored-by: Oli Morris <[email protected]>

Author: olimorris

lua/codecompanion/strategies/chat/init.lua

@@ -219,7 +219,7 @@ function Chat.new(args)
   util.fire("ChatModel", { bufnr = self.bufnr, model = self.adapter.schema.model.default })
   util.fire("ChatCreated", { bufnr = self.bufnr, from_prompt_library = self.from_prompt_library })
 
-  self:apply_settings(self.opts.settings)
+  self:apply_settings(schema.get_default(self.adapter.schema, self.opts.settings))
 
   self.ui = require("codecompanion.strategies.chat.ui").new({
     adapter = self.adapter,
@@ -365,11 +365,13 @@ function Chat:_get_settings_key(opts)
 end
 
 ---Apply custom settings to the chat buffer
----@param settings table
+---@param settings? table
 ---@return self
 function Chat:apply_settings(settings)
-  _cached_settings[self.bufnr] = settings
+  settings = settings or schema.get_default(self.adapter.schema, self.opts.settings)
+
   self.settings = settings
+  _cached_settings[self.bufnr] = settings
 
   return self
 end

tests/helpers.lua

@@ -99,7 +99,7 @@ Helpers.config = {
   },
 }
 
-Helpers.setup_chat_buffer = function()
+Helpers.setup_chat_buffer = function(config)
   local codecompanion = require("codecompanion")
 
   local adapter = {
@@ -133,7 +133,7 @@ Helpers.setup_chat_buffer = function()
     },
   }
 
-  codecompanion.setup(Helpers.config)
+  codecompanion.setup(config or Helpers.config)
 
   local chat = require("codecompanion.strategies.chat").new({
     context = { bufnr = 1, filetype = "lua" },

tests/strategies/chat/test_settings.lua

@@ -0,0 +1,33 @@
+local h = require("tests.helpers")
+
+local new_set = MiniTest.new_set
+local T = new_set()
+
+local chat, _
+
+T["Settings"] = new_set({
+  hooks = {
+    pre_case = function()
+      chat, _ = h.setup_chat_buffer({
+        display = {
+          chat = {
+            show_settings = true,
+          },
+        },
+      })
+    end,
+    post_case = function()
+      h.teardown_chat_buffer()
+    end,
+  },
+})
+
+T["Settings"]["Are rendered correctly"] = function()
+  local buffer = h.get_buf_lines(chat.bufnr)
+
+  h.eq("---", buffer[1])
+  h.eq("model: gpt-3.5-turbo", buffer[2])
+  h.eq("---", buffer[3])
+end
+
+return T