diff --git a/lua/gemini/completion.lua b/lua/gemini/completion.lua index 817329d..f30c500 100644 --- a/lua/gemini/completion.lua +++ b/lua/gemini/completion.lua @@ -9,6 +9,11 @@ local current_suggestion = { timer = nil } +-- Debug function +local function debug_print(...) + vim.notify(string.format(...), vim.log.levels.INFO) +end + -- Helper function to clear suggestion local function clear_suggestion() if current_suggestion.timer then @@ -56,6 +61,8 @@ local function show_suggestion(suggestion, start_col) virt_text_pos = 'inline', virt_text_hide = true, }) + + debug_print("Showing suggestion: %s", suggestion) end function M.accept_suggestion() @@ -93,67 +100,73 @@ function M.trigger_completion() vim.fn.timer_stop(current_suggestion.timer) end - -- Start a new timer for debouncing - current_suggestion.timer = vim.fn.timer_start(100, function() - local cursor = vim.api.nvim_win_get_cursor(0) - local line = cursor[1] - local col = cursor[2] - - -- Get entire buffer content - local lines = vim.api.nvim_buf_get_lines(0, 0, -1, false) - local current_line = lines[line] - - -- Don't trigger completion if line is empty or cursor is at the start - if col == 0 or current_line:match("^%s*$") then - clear_suggestion() - return + debug_print("Triggering completion...") + + -- Get current buffer and cursor info + local cursor = vim.api.nvim_win_get_cursor(0) + local line = cursor[1] + local col = cursor[2] + + -- Get entire buffer content + local lines = vim.api.nvim_buf_get_lines(0, 0, -1, false) + local current_line = lines[line] + + -- Don't trigger completion if line is empty or cursor is at the start + if col == 0 or current_line:match("^%s*$") then + clear_suggestion() + return + end + + -- Get text before cursor on current line + local prefix = string.sub(current_line, 1, col) + + -- Don't trigger on certain conditions + if prefix:match("^%s*$") or -- empty or whitespace + prefix:match("[%s%-]$") or -- ends with space or dash + #prefix < 3 then -- too short + clear_suggestion() + return + end + + debug_print("Getting completion for: %s", prefix) + + -- Construct context from buffer + local context = {} + + -- Add up to 10 previous lines for context + local start_line = math.max(1, line - 10) + for i = start_line, line - 1 do + table.insert(context, lines[i]) + end + + -- Add current line + table.insert(context, current_line) + + -- Combine all lines + local full_context = table.concat(context, "\n") + + -- Construct prompt for Gemini + local prompt = string.format( + "Complete this code. Return ONLY the completion that would naturally follow, no explanation:\n%s", + full_context + ) + + -- Get completion from Gemini + api.get_response(prompt, nil, function(response, error) + if error then + debug_print("Completion error: %s", error) + return end - -- Get text before cursor on current line - local prefix = string.sub(current_line, 1, col) - - -- Don't trigger on certain conditions - if prefix:match("^%s*$") or -- empty or whitespace - prefix:match("[%s%-]$") or -- ends with space or dash - #prefix < 3 then -- too short - clear_suggestion() - return + if type(response) == "string" then + vim.schedule(function() + -- Check if cursor position is still valid + local new_cursor = vim.api.nvim_win_get_cursor(0) + if new_cursor[1] == line and new_cursor[2] >= col then + show_suggestion(response, col) + end + end) end - - -- Construct context from buffer - local context = {} - - -- Add previous lines for context - for i = 1, line - 1 do - table.insert(context, lines[i]) - end - - -- Add current line - table.insert(context, current_line) - - -- Combine all lines - local full_context = table.concat(context, "\n") - - -- Construct prompt for Gemini - local prompt = string.format( - "Complete this code. Provide only the completion that would naturally follow, no explanation:\n%s", - full_context - ) - - -- Get completion from Gemini - api.get_response(prompt, nil, function(response, error) - if error then return end - - if type(response) == "string" then - vim.schedule(function() - -- Check if cursor position is still valid - local new_cursor = vim.api.nvim_win_get_cursor(0) - if new_cursor[1] == line and new_cursor[2] >= col then - show_suggestion(response, col) - end - end) - end - end) end) end @@ -175,6 +188,7 @@ function M.setup() -- Set up autocommand for real-time completion vim.api.nvim_create_autocmd("TextChangedI", { + pattern = "*", callback = function() M.trigger_completion() end @@ -182,10 +196,13 @@ function M.setup() -- Clear suggestion on cursor move vim.api.nvim_create_autocmd({'CursorMovedI', 'CursorMoved'}, { + pattern = "*", callback = function() clear_suggestion() end }) + + debug_print("Gemini completion setup complete") end return M \ No newline at end of file diff --git a/lua/gemini/init.lua b/lua/gemini/init.lua index a044c54..01adabe 100644 --- a/lua/gemini/init.lua +++ b/lua/gemini/init.lua @@ -46,20 +46,11 @@ function M.setup(opts) -- Set up completion require("gemini.completion").setup() - -- Auto-trigger completion after a short delay when typing - vim.api.nvim_create_autocmd("TextChangedI", { - callback = function() - -- Cancel any existing timer - if vim.b.completion_timer then - vim.fn.timer_stop(vim.b.completion_timer) - end - - -- Start new timer - vim.b.completion_timer = vim.fn.timer_start(500, function() - require("gemini.completion").trigger_completion() - end) - end - }) + -- Remove the existing TextChangedI autocmd as it's now handled in completion.lua + -- Instead, just ensure the completion is available + vim.keymap.set('i', '', function() + require("gemini.completion").trigger_completion() + end, { desc = 'Trigger Gemini completion' }) vim.api.nvim_create_user_command("Gemini", function(opts) if opts.args == "" then