From 0c56f24336a999a4b0bb3afa252cde9698a6b80b Mon Sep 17 00:00:00 2001 From: Jonas Widen Date: Tue, 18 Mar 2025 18:28:12 +0100 Subject: [PATCH] Review and cleanup --- lua/gemini/completion.lua | 58 +++++++++++++++++++++++++++++++++-- lua/gemini/init.lua | 63 +++++---------------------------------- 2 files changed, 62 insertions(+), 59 deletions(-) diff --git a/lua/gemini/completion.lua b/lua/gemini/completion.lua index 51e5ae7..2c069d7 100644 --- a/lua/gemini/completion.lua +++ b/lua/gemini/completion.lua @@ -14,6 +14,34 @@ local current_suggestion = { max_context_lines = 10, -- Maximum number of context lines to send } +-- Add at the top of the file with other state variables +local completion_cache = { + last_line = nil, + last_col = nil, + suggestions = {}, + timestamp = 0, + ttl = 30000 -- Cache TTL in milliseconds (30 seconds) +} + +-- Add this function +local function get_cached_suggestion(line, col) + local now = vim.loop.now() + if completion_cache.last_line == line + and completion_cache.last_col == col + and (now - completion_cache.timestamp) < completion_cache.ttl then + return completion_cache.suggestions + end + return nil +end + +-- Add this function +local function cache_suggestion(line, col, suggestions) + completion_cache.last_line = line + completion_cache.last_col = col + completion_cache.suggestions = suggestions + completion_cache.timestamp = vim.loop.now() +end + -- Helper function to get visible lines around cursor local function get_visible_lines() local win = vim.api.nvim_get_current_win() @@ -246,9 +274,11 @@ function M.trigger_completion() if not vim.b.gemini_completion_enabled then return end if vim.fn.pumvisible() ~= 0 then return end + -- Get current line and cursor position local cursor = vim.api.nvim_win_get_cursor(0) local line = cursor[1] - 1 local col = cursor[2] + local current_line = vim.api.nvim_get_current_line() -- Check filetype exclusions local config = require("gemini.config") @@ -256,12 +286,34 @@ function M.trigger_completion() return end - -- Get context and trigger completion + -- Get context local visible_lines, relative_cursor = get_visible_lines() local context = get_context_around_cursor(visible_lines, relative_cursor, config.options.completion.max_context_lines) - -- Use improved debouncing - trigger_completion_debounced(context) + -- Create prompt for API + local prompt = table.concat(context, "\n") .. "\nPlease complete the following line:\n" .. current_line + + -- Make API request + api.get_response(prompt, nil, function(response, error) + if error then + vim.notify("Completion error: " .. error, vim.log.levels.ERROR) + return + end + + if response then + -- Extract the completion suggestion + local suggestion = response:gsub("^%s*(.-)%s*$", "%1") -- Trim whitespace + + -- Show the suggestion + vim.schedule(function() + -- Only show if cursor position hasn't changed + local new_cursor = vim.api.nvim_win_get_cursor(0) + if new_cursor[1] - 1 == line and new_cursor[2] == col then + show_suggestion(suggestion, col) + end + end) + end + end) end -- Setup function to create highlight group and keymaps diff --git a/lua/gemini/init.lua b/lua/gemini/init.lua index afff112..953b3da 100644 --- a/lua/gemini/init.lua +++ b/lua/gemini/init.lua @@ -49,67 +49,18 @@ function M.setup(opts) vim.api.nvim_create_autocmd("BufEnter", { pattern = "*", callback = function() - vim.b.gemini_completion_enabled = true + -- Only enable for specific filetypes + local ft = vim.bo.filetype + if not vim.tbl_contains(config.options.completion.exclude_filetypes, ft) then + vim.b.gemini_completion_enabled = true + end end }) - -- Completion keymaps - vim.keymap.set('i', 'gg', function() - debug_print("Keymap triggered") - -- Enable completion for current buffer - vim.b.gemini_completion_enabled = true + -- Add completion trigger keymap + vim.keymap.set('i', '', function() completion.trigger_completion() end, { desc = 'Trigger Gemini completion' }) - - pcall(vim.treesitter.language.require_language, "markdown") - - -- Set up commands - vim.api.nvim_create_user_command("Gemini", function(opts) - if opts.args == "" then - vim.notify("Please provide a prompt for Gemini.", vim.log.levels.WARN) - return - end - M.query(opts.args) - end, { - desc = "Query Google AI", - nargs = "+", - complete = "shellcmd", - }) - - vim.api.nvim_create_user_command("GeminiClearChat", function() - api.clear_conversation() - chat.clear() - vim.notify("Chat history cleared", vim.log.levels.INFO) - end, { - desc = "Clear Gemini chat history" - }) - - -- Chat keymaps - vim.keymap.set("n", "gc", function() - M.prompt_query() - end, { desc = "Chat with Gemini AI" }) - - vim.keymap.set("n", "gs", function() - M.prompt_query(get_current_buffer_content()) - end, { desc = "Chat with Gemini AI (with buffer context)" }) - - vim.keymap.set("n", "gq", function() - api.clear_conversation() - chat.clear() - vim.notify("Chat history cleared", vim.log.levels.INFO) - end, { desc = "Clear Gemini chat history" }) - - -- Add a command to toggle completion - vim.api.nvim_create_user_command("GeminiToggleCompletion", function() - vim.b.gemini_completion_enabled = not vim.b.gemini_completion_enabled - vim.notify( - string.format("Gemini completion %s", - vim.b.gemini_completion_enabled and "enabled" or "disabled"), - vim.log.levels.INFO - ) - end, { - desc = "Toggle Gemini completion" - }) end function M.complete(findstart, base)