[grok-nvim] 0.1.1-108.1-p: UI polish: working on UI color to match grok prompt UI look/feel

Author: acris-software

lua/grok/ui.lua

@@ -14,18 +14,10 @@ M.tabs = { "1: Grok", "2: Keymaps", "3: Config" }
 local ui_state = require("grok.ui.state")
 M.current_tab = ui_state.state.current_tab
 
--- Theme-aware highlights
-local color = require("grok.ui.color")
-local normal_hl = vim.api.nvim_get_hl(0, { name = "Normal" })
-local float_hl = vim.api.nvim_get_hl(0, { name = "NormalFloat" })
-
-local user_fg = normal_hl.fg and string.format("#%06x", normal_hl.fg) or "#c0caf5" -- Lightish blue-grey fallback
-local grok_bg_hex = float_hl.bg and string.format("#%06x", float_hl.bg) or "#1e1e1e" -- Dark fallback
-local grok_bg_dark = color.darken_color(grok_bg_hex, 0.8) -- Darken by 20%
-local grok_fg = float_hl.fg and string.format("#%06x", float_hl.fg) or "#ffffff"
-
-vim.api.nvim_set_hl(0, "GrokUser", { fg = user_fg }) -- Lighter fg for user
-vim.api.nvim_set_hl(0, "GrokAssistant", { bg = grok_bg_dark, fg = grok_fg }) -- Darker bg for Grok
+-- Fixed highlights for v0.1.1 polish
+vim.api.nvim_set_hl(0, "GrokUser", { bg = "#333333", fg = "#ffffff" }) -- Charcoal gray bg, white fg for user
+vim.api.nvim_set_hl(0, "GrokAssistant", { bg = "#1a1a1a", fg = "#ffffff" }) -- Dark black bg, white fg for Grok
+vim.api.nvim_set_hl(0, "GrokChatWindow", { bg = "#2d2d2d" }) -- Neutral chat window bg (dark grey)
 
 M.open_chat_window = require("grok.ui.window").open_chat_window
 M.append_response = require("grok.ui.render").append_response

lua/grok/ui/render.lua

@@ -11,18 +11,23 @@ local function render_tab_header(buf)
 end
 
 local function render_tab_content(buf, callback)
-  local history = require("grok.chat.history").get() -- For re-rendering (Issue 1)
+  local history = require("grok.chat.history").get() -- For re-rendering
   vim.api.nvim_buf_set_option(buf, "modifiable", true)
-  vim.api.nvim_buf_set_lines(buf, 1, -1, false, {})
+  vim.api.nvim_buf_set_lines(buf, 0, -1, false, {})
   vim.cmd("stopinsert")
+
+  -- Apply chat window background
+  vim.api.nvim_set_option_value("winhl", "Normal:GrokChatWindow", { win = require("grok.ui").current_win })
+
   if require("grok.ui").current_tab == 1 then -- Grok
     local chat_lines = {}
+    local line_idx = 1 -- Track buffer line for highlighting
     for _, msg in ipairs(history) do
       local role = msg.role == "user" and "You" or "Grok"
       local content_lines = vim.split(msg.content, "\n", { plain = true })
       table.insert(chat_lines, role .. ": " .. (content_lines[1] or ""))
       for i = 2, #content_lines do
-        table.insert(chat_lines, " " .. content_lines[i])
+        table.insert(chat_lines, "  " .. content_lines[i]) -- Indent continuation lines
       end
       table.insert(chat_lines, "")
     end
@@ -31,6 +36,19 @@ local function render_tab_content(buf, callback)
       table.insert(chat_lines, "")
     end
     vim.api.nvim_buf_set_lines(buf, 1, -1, false, chat_lines)
+
+    -- Apply highlights per message block
+    local current_line = 1
+    for _, msg in ipairs(history) do
+      local role = msg.role
+      local msg_lines = #vim.split(msg.content, "\n", { plain = true }) + 1 -- +1 for empty line
+      local hl_group = (role == "user") and "GrokUser" or "GrokAssistant"
+      for i = 0, msg_lines - 1 do
+        vim.api.nvim_buf_add_highlight(buf, require("grok.ui").ns, hl_group, current_line + i - 1, 0, -1)
+      end
+      current_line = current_line + msg_lines
+    end
+
     if require("grok.ui").current_win and vim.api.nvim_win_is_valid(require("grok.ui").current_win) then
       require("grok.util").auto_scroll(buf, require("grok.ui").current_win) -- v0.1.1 Auto-scroll
     end
@@ -57,10 +75,9 @@ local function render_tab_content(buf, callback)
         " Max Tokens: " .. config.max_tokens,
         " Debug: " .. tostring(config.debug),
         " Prompt Position: " .. config.prompt_position, -- v0.1.1 Visible UI option
-        -- TODO: Add more; make editable? For real-time, use autocmd on BufLeave
       }
     end
-    vim.api.nvim_buf_set_lines(buf, -1, -1, false, content_lines)
+    vim.api.nvim_buf_set_lines(buf, 1, -1, false, content_lines)
     render_tab_header(buf) -- Refresh header before locking
     vim.api.nvim_buf_set_option(buf, "modifiable", false) -- Lock non-chat tabs
   end
@@ -86,6 +103,14 @@ local function append_response(text)
     local lines = vim.split(new_text, "\n", { plain = true })
     vim.api.nvim_buf_set_lines(require("grok.ui").current_buf, line_count - 1, line_count, false, lines)
     require("grok.util").auto_scroll(require("grok.ui").current_buf, require("grok.ui").current_win) -- v0.1.1 Auto-scroll
+    vim.api.nvim_buf_add_highlight(
+      require("grok.ui").current_buf,
+      require("grok.ui").ns,
+      "GrokAssistant",
+      line_count - 1,
+      0,
+      -1
+    )
     vim.api.nvim_buf_set_option(require("grok.ui").current_buf, "modifiable", false)
   end)
   if not ok then

lua/grok/util.lua

@@ -60,17 +60,8 @@ function M.create_floating_input(opts)
   local buf = vim.api.nvim_create_buf(false, true)
   local width = math.floor(vim.o.columns * 0.6)
   local height = 3
-  local row, col
-  if config.prompt_position == "left" then
-    row = math.floor(vim.o.lines * 0.1)
-    col = math.floor(vim.o.columns * 0.1)
-  elseif config.prompt_position == "right" then
-    row = math.floor(vim.o.lines * 0.1)
-    col = math.floor(vim.o.columns * 0.9 - width)
-  else -- center
-    row = math.floor((vim.o.lines - height) / 2)
-    col = math.floor((vim.o.columns - width) / 2)
-  end
+  local row = math.floor(vim.o.lines - height - 2) -- Bottom-aligned, 2 lines from edge
+  local col = math.floor((vim.o.columns - width) / 2) -- Centered horizontally
   local win_opts = {
     relative = "editor",
     width = width,
@@ -84,22 +75,18 @@ function M.create_floating_input(opts)
   local win = vim.api.nvim_open_win(buf, true, win_opts)
   vim.api.nvim_buf_set_option(buf, "modifiable", true)
   vim.api.nvim_buf_set_option(buf, "buftype", "prompt")
-  -- Clear any existing text
   vim.fn.prompt_setprompt(buf, "")
   log.debug("Prompt set to empty string")
   vim.api.nvim_buf_set_lines(buf, 0, -1, false, {})
-  -- Store callback in buffer variable
   if opts.callback then
     vim.api.nvim_buf_set_var(buf, "grok_callback", opts.callback)
   end
-  -- Char counter autocmd with window validity check
   local char_count = 0
   local autocmd_id = vim.api.nvim_create_autocmd({ "TextChanged", "TextChangedI" }, {
     buffer = buf,
     callback = function()
-      -- Check if window is still valid
       if not vim.api.nvim_win_is_valid(win) then
-        return true -- Returning true removes the autocmd
+        return true
       end
       local text = table.concat(vim.api.nvim_buf_get_lines(buf, 0, -1, false), "\n")
       char_count = #text
@@ -113,21 +100,17 @@ function M.create_floating_input(opts)
       if new_height ~= height then
         height = new_height
         win_opts.height = height
-        if config.prompt_position == "center" then
-          win_opts.row = math.floor((vim.o.lines - height) / 2)
-        end
+        win_opts.row = math.floor(vim.o.lines - height - 2) -- Recalculate bottom row
         vim.api.nvim_win_set_config(win, win_opts)
       end
     end,
   })
-  -- Clean up autocmd when buffer is deleted
   vim.api.nvim_create_autocmd("BufWipeout", {
     buffer = buf,
     callback = function()
       vim.api.nvim_del_autocmd(autocmd_id)
     end,
   })
-  -- Keymaps for input
   vim.api.nvim_buf_set_keymap(
     buf,
     "i",
@@ -149,10 +132,18 @@ function M.create_floating_input(opts)
     "<cmd>lua vim.api.nvim_buf_set_lines(0, 0, -1, false, {})<CR>",
     { noremap = true, silent = true }
   )
-  -- Explicitly enter insert mode cleanly
   vim.api.nvim_command("startinsert")
 end
 
+function M.submit_input()
+  local buf = vim.api.nvim_get_current_buf()
+  local text = table.concat(vim.api.nvim_buf_get_lines(buf, 0, -1, false), "\n")
+  local ok, callback = pcall(vim.api.nvim_buf_get_var, buf, "grok_callback")
+  vim.api.nvim_win_close(0, true)
+  if ok and callback then
+    callback(text)
+  end
+end
 function M.submit_input()
   local buf = vim.api.nvim_get_current_buf()
   local text = table.concat(vim.api.nvim_buf_get_lines(buf, 0, -1, false), "\n")