Set disable_completion_within_the_line

luozhiya · Jun 7, 2024 · c1c13ef · c1c13ef
1 parent 850ea92
commit c1c13ef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/lua/fittencode/config.lua b/lua/fittencode/config.lua
@@ -144,13 +144,6 @@ local defaults = {
   },
 }
 
--- Private options
-M.internal = {
-  virtual_text = {
-    inline = vim.fn.has('nvim-0.10') == 1,
-  },
-}
-
 ---@param opts? FittenCodeOptions
 function M.setup(opts)
   ---@class FittenCodeOptions
@@ -159,6 +152,9 @@ function M.setup(opts)
     M.options.keymaps.inline = {}
     M.options.keymaps.chat = {}
   end
+  if vim.fn.has('nvim-0.10') ~= 1 then
+    M.options.inline_completion.disable_completion_within_the_line = true
+  end
 end
 
 return M
diff --git a/lua/fittencode/sessions.lua b/lua/fittencode/sessions.lua
@@ -112,7 +112,7 @@ local function make_generate_one_stage_params(opts)
   if prompt == nil then
     return
   end
-  if prompt.within_the_line and (not Config.internal.virtual_text.inline or Config.options.inline_completion.disable_completion_within_the_line) then
+  if prompt.within_the_line and Config.options.inline_completion.disable_completion_within_the_line then
     return
   end
   local fc_prompt = '!FCPREFIX!' .. prompt.prefix .. '!FCSUFFIX!' .. prompt.suffix .. '!FCMIDDLE!'

diff --git a/lua/fittencode/views/lines.lua b/lua/fittencode/views/lines.lua
@@ -83,7 +83,7 @@ local function set_extmark(virt_text, hl_mode)
   local row, col = Base.get_cursor()
   local ids = {}
 
-  if Config.internal.virtual_text.inline then
+  if vim.fn.has('nvim-0.10') == 1 then
     ids[#ids + 1] = api.nvim_buf_set_extmark(0, namespace, row, col, {
       virt_text = virt_text[1],
       virt_text_pos = 'inline',