Merge branch 'jackMort:main' into main

Author: yorik1984

.github/FUNDING.yml

@@ -1,3 +1,4 @@
 # These are supported funding model platforms
 
+github: jackMort
 ko_fi: jackmort

README.md

@@ -205,9 +205,11 @@ keybindings are available:
 - `<C-Enter>` [Both] to submit.
 - `<C-y>` [Both] to copy/yank last answer.
 - `<C-o>` [Both] Toggle settings window.
+- `<C-h>` [Both] Toggle help window.
 - `<Tab>` [Both] Cycle over windows.
 - `<C-f>` [Chat] Cycle over modes (center, stick to right).
 - `<C-c>` [Both] to close chat window.
+- `<C-p>` [Chat] Toggle sessions list.
 - `<C-u>` [Chat] scroll up chat window.
 - `<C-d>` [Chat] scroll down chat window.
 - `<C-k>` [Chat] to copy/yank code from last answer.

lua/chatgpt/code_edits.lua

@@ -9,6 +9,7 @@ local Config = require("chatgpt.config")
 local Utils = require("chatgpt.utils")
 local Spinner = require("chatgpt.spinner")
 local Settings = require("chatgpt.settings")
+local Help = require("chatgpt.help")
 
 EDIT_FUNCTION_ARGUMENTS = {
   function_call = {
@@ -140,6 +141,9 @@ M.edit_with_instructions = function(output_lines, bufnr, selection, ...)
   local openai_params = Config.options.openai_edit_params
   local use_functions_for_edits = Config.options.use_openai_functions_for_edits
   local settings_panel = Settings.get_settings_panel("edits", openai_params)
+  local help_panel = Help.get_help_panel("edit") -- I like the highlighting for Lua.
+  local open_extra_panels = {} -- tracks which extra panels are open
+  local active_panel = instructions_input -- for cycling windows
   input_window = Popup(Config.options.popup_window)
   output_window = Popup(Config.options.popup_window)
   instructions_input = ChatInput(Config.options.popup_input, {
@@ -226,56 +230,119 @@ M.edit_with_instructions = function(output_lines, bufnr, selection, ...)
     end, { noremap = true })
   end
 
+  local function inTable(tbl, item)
+    for key, value in pairs(tbl) do
+      if value == item then
+        return key
+      end
+    end
+    return false
+  end
+
+  -- toggle extra panels
+  local function toggle_extra_panel(extra_panel, modifiable_panel)
+    local extra_open = inTable(open_extra_panels, extra_panel)
+    if not extra_open then
+      table.insert(open_extra_panels, extra_panel)
+      local extra_boxes = function()
+        local box_size = (100 / #open_extra_panels) .. "%"
+        local boxes = {}
+        for i, panel in ipairs(open_extra_panels) do
+          -- for the last panel, make it grow to fill the remaining space
+          if i == #open_extra_panels then
+            table.insert(boxes, Layout.Box(panel, { grow = 1 }))
+          else
+            table.insert(boxes, Layout.Box(panel, { size = box_size }))
+          end
+        end
+        return Layout.Box(boxes, { dir = "col", size = 40 })
+      end
+      layout:update(Layout.Box({
+        Layout.Box({
+          Layout.Box(input_window, { grow = 1 }),
+          Layout.Box(instructions_input, { size = 3 }),
+        }, { dir = "col", grow = 1 }),
+        Layout.Box(output_window, { grow = 1 }),
+        extra_boxes(),
+      }, { dir = "row" }))
+      extra_panel:show()
+      extra_panel:mount()
+
+      vim.api.nvim_set_current_win(extra_panel.winid)
+      active_panel = extra_panel
+      vim.api.nvim_buf_set_option(extra_panel.bufnr, "modifiable", modifiable_panel)
+      vim.api.nvim_win_set_option(extra_panel.winid, "cursorline", true)
+    else
+      table.remove(open_extra_panels, extra_open)
+      if #open_extra_panels == 0 then
+        layout:update(Layout.Box({
+          Layout.Box({
+            Layout.Box(input_window, { grow = 1 }),
+            Layout.Box(instructions_input, { size = 3 }),
+          }, { dir = "col", size = "50%" }),
+          Layout.Box(output_window, { size = "50%" }),
+        }, { dir = "row" }))
+        extra_panel:hide()
+        vim.api.nvim_set_current_win(instructions_input.winid)
+        active_panel = instructions_input
+      else
+        local box_size = (100 / #open_extra_panels) .. "%"
+        local extra_boxes = function()
+          local boxes = {}
+          for _, panel in ipairs(open_extra_panels) do
+            table.insert(boxes, Layout.Box(panel, { size = box_size }))
+          end
+          return Layout.Box(boxes, { dir = "col", size = 40 })
+        end
+        layout:update(Layout.Box({
+          Layout.Box({
+            Layout.Box(input_window, { grow = 1 }),
+            Layout.Box(instructions_input, { size = 3 }),
+          }, { dir = "col", grow = 1 }),
+          Layout.Box(output_window, { grow = 1 }),
+          extra_boxes(),
+        }, { dir = "row" }))
+        extra_panel:hide()
+        vim.api.nvim_set_current_win(open_extra_panels[#open_extra_panels].winid)
+        active_panel = open_extra_panels[#open_extra_panels]
+      end
+    end
+    for _, window in ipairs({ input_window, output_window }) do
+      vim.api.nvim_buf_set_option(window.bufnr, "filetype", filetype)
+      vim.api.nvim_win_set_option(window.winid, "number", true)
+    end
+  end
+
   -- toggle settings
-  local settings_open = false
-  for _, popup in ipairs({ settings_panel, instructions_input }) do
+  for _, popup in ipairs({ instructions_input, settings_panel, help_panel }) do
     for _, mode in ipairs({ "n", "i" }) do
       popup:map(mode, Config.options.edit_with_instructions.keymaps.toggle_settings, function()
-        if settings_open then
-          layout:update(Layout.Box({
-            Layout.Box({
-              Layout.Box(input_window, { grow = 1 }),
-              Layout.Box(instructions_input, { size = 3 }),
-            }, { dir = "col", size = "50%" }),
-            Layout.Box(output_window, { size = "50%" }),
-          }, { dir = "row" }))
-          settings_panel:hide()
-          vim.api.nvim_set_current_win(instructions_input.winid)
-        else
-          layout:update(Layout.Box({
-            Layout.Box({
-              Layout.Box(input_window, { grow = 1 }),
-              Layout.Box(instructions_input, { size = 3 }),
-            }, { dir = "col", grow = 1 }),
-            Layout.Box(output_window, { grow = 1 }),
-            Layout.Box(settings_panel, { size = 40 }),
-          }, { dir = "row" }))
-          settings_panel:show()
-          settings_panel:mount()
-
-          vim.api.nvim_set_current_win(settings_panel.winid)
-          vim.api.nvim_buf_set_option(settings_panel.bufnr, "modifiable", false)
-          vim.api.nvim_win_set_option(settings_panel.winid, "cursorline", true)
-        end
-        settings_open = not settings_open
+        toggle_extra_panel(settings_panel, false)
+        -- set input and output settings
+        --  TODO
+      end, {})
+    end
+  end
+
+  -- toggle help
+  for _, popup in ipairs({ instructions_input, settings_panel, help_panel }) do
+    for _, mode in ipairs({ "n", "i" }) do
+      popup:map(mode, Config.options.edit_with_instructions.keymaps.toggle_help, function()
+        toggle_extra_panel(help_panel, false)
         -- set input and output settings
         --  TODO
-        for _, window in ipairs({ input_window, output_window }) do
-          vim.api.nvim_buf_set_option(window.bufnr, "filetype", filetype)
-          vim.api.nvim_win_set_option(window.winid, "number", true)
-        end
       end, {})
     end
   end
 
   -- cycle windows
-  local active_panel = instructions_input
-  for _, popup in ipairs({ input_window, output_window, settings_panel, instructions_input }) do
+  for _, popup in ipairs({ input_window, output_window, settings_panel, help_panel, instructions_input }) do
     for _, mode in ipairs({ "n", "i" }) do
       if mode == "i" and (popup == input_window or popup == output_window) then
         goto continue
       end
       popup:map(mode, Config.options.edit_with_instructions.keymaps.cycle_windows, function()
+        local in_table = inTable(open_extra_panels, active_panel)
         if active_panel == instructions_input then
           vim.api.nvim_set_current_win(input_window.winid)
           active_panel = input_window
@@ -285,16 +352,23 @@ M.edit_with_instructions = function(output_lines, bufnr, selection, ...)
           active_panel = output_window
           vim.api.nvim_command("stopinsert")
         elseif active_panel == output_window and mode ~= "i" then
-          if settings_open then
-            vim.api.nvim_set_current_win(settings_panel.winid)
-            active_panel = settings_panel
+          if #open_extra_panels == 0 then
+            vim.api.nvim_set_current_win(instructions_input.winid)
+            active_panel = instructions_input
           else
+            vim.api.nvim_set_current_win(open_extra_panels[1].winid)
+            active_panel = open_extra_panels[1]
+          end
+        elseif in_table then
+          -- next index with wrap around and 0 for instructions_input
+          local next_index = (in_table + 1) % (#open_extra_panels + 1)
+          if next_index == 0 then
             vim.api.nvim_set_current_win(instructions_input.winid)
             active_panel = instructions_input
+          else
+            vim.api.nvim_set_current_win(open_extra_panels[next_index].winid)
+            active_panel = open_extra_panels[next_index]
           end
-        elseif active_panel == settings_panel then
-          vim.api.nvim_set_current_win(instructions_input.winid)
-          active_panel = instructions_input
         end
       end, {})
       ::continue::
@@ -303,7 +377,7 @@ M.edit_with_instructions = function(output_lines, bufnr, selection, ...)
 
   -- toggle diff mode
   local diff_mode = Config.options.edit_with_instructions.diff
-  for _, popup in ipairs({ settings_panel, instructions_input }) do
+  for _, popup in ipairs({ help_panel, settings_panel, instructions_input }) do
     for _, mode in ipairs({ "n", "i" }) do
       popup:map(mode, Config.options.edit_with_instructions.keymaps.toggle_diff, function()
         diff_mode = not diff_mode

lua/chatgpt/config.lua

@@ -17,6 +17,7 @@ function M.defaults()
         accept = "<C-y>",
         toggle_diff = "<C-d>",
         toggle_settings = "<C-o>",
+        toggle_help = "<C-h>",
         cycle_windows = "<Tab>",
         use_output_as_input = "<C-i>",
       },
@@ -44,7 +45,7 @@ function M.defaults()
         },
       },
       keymaps = {
-        close = { "<C-c>" },
+        close = "<C-c>",
         yank_last = "<C-y>",
         yank_last_code = "<C-k>",
         scroll_up = "<C-u>",
@@ -57,10 +58,12 @@ function M.defaults()
         select_session = "<Space>",
         rename_session = "r",
         delete_session = "d",
-        draft_message = "<C-d>",
+        draft_message = "<C-r>",
         edit_message = "e",
         delete_message = "d",
         toggle_settings = "<C-o>",
+        toggle_sessions = "<C-p>",
+        toggle_help = "<C-h>",
         toggle_message_role = "<C-r>",
         toggle_system_role_open = "<C-s>",
         stop_generating = "<C-x>",
@@ -139,6 +142,18 @@ function M.defaults()
         winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
       },
     },
+    help_window = {
+      setting_sign = "  ",
+      border = {
+        style = "rounded",
+        text = {
+          top = " Help ",
+        },
+      },
+      win_options = {
+        winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
+      },
+    },
     openai_params = {
       model = "gpt-3.5-turbo",
       frequency_penalty = 0,
@@ -160,6 +175,10 @@ function M.defaults()
     actions_paths = {},
     show_quickfixes_cmd = "Trouble quickfix",
     predefined_chat_gpt_prompts = "https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/main/prompts.csv",
+    highlights = {
+      help_key = "@symbol",
+      help_description = "@comment",
+    },
   }
   return defaults
 end