From 103063715f929a804c99298c435d067da0f18414 Mon Sep 17 00:00:00 2001
From: Jonas Widen <jonas.widen@widens.eu>
Date: Sun, 16 Mar 2025 21:44:38 +0100
Subject: [PATCH] Added completion

---
 lua/gemini/completion.lua | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/lua/gemini/completion.lua b/lua/gemini/completion.lua
index e7ebc05..d40ffa6 100644
--- a/lua/gemini/completion.lua
+++ b/lua/gemini/completion.lua
@@ -26,25 +26,49 @@ local function show_suggestion(suggestion, start_col)
     if suggestion == "" then return end
     
     local line = vim.api.nvim_win_get_cursor(0)[1] - 1
+    local line_text = vim.api.nvim_buf_get_lines(0, line, line + 1, true)[1]
+    
+    -- Validate column position
+    if start_col > #line_text then
+        return
+    end
+    
     current_suggestion.text = suggestion
     current_suggestion.start_col = start_col
     
     -- Make the text virtual (doesn't affect actual buffer content)
     vim.api.nvim_buf_set_extmark(0, current_suggestion.namespace_id, line, start_col, {
         virt_text = {{suggestion, 'GeminiSuggestion'}},
-        virt_text_pos = 'overlay',
+        virt_text_pos = 'inline',  -- Changed from 'overlay' to 'inline'
+        virt_text_hide = true,     -- Hide when there's other virtual text
     })
 end
 
 -- Function to accept current suggestion
 function M.accept_suggestion()
-    if current_suggestion.text and current_suggestion.start_col then
-        local line = vim.api.nvim_win_get_cursor(0)[1] - 1
-        vim.api.nvim_buf_set_text(0, line, current_suggestion.start_col, line, current_suggestion.start_col, {current_suggestion.text})
-        clear_suggestion()
-        return true
+    if not (current_suggestion.text and current_suggestion.start_col) then
+        return false
     end
-    return false
+
+    local line = vim.api.nvim_win_get_cursor(0)[1] - 1
+    local line_text = vim.api.nvim_buf_get_lines(0, line, line + 1, true)[1]
+    
+    -- Validate column position
+    if current_suggestion.start_col > #line_text then
+        clear_suggestion()
+        return false
+    end
+    
+    vim.api.nvim_buf_set_text(
+        0,
+        line,
+        current_suggestion.start_col,
+        line,
+        current_suggestion.start_col,
+        {current_suggestion.text}
+    )
+    clear_suggestion()
+    return true
 end
 
 function M.trigger_completion()