From 6f13034845f866726113f81c5dc07945e08e52db Mon Sep 17 00:00:00 2001 From: yetone Date: Mon, 3 Mar 2025 15:18:35 +0800 Subject: [PATCH] fix: remove accidentally introduced files (#1472) --- lua/avante/init.lua-E | 424 ------------------------------------------ 1 file changed, 424 deletions(-) delete mode 100644 lua/avante/init.lua-E diff --git a/lua/avante/init.lua-E b/lua/avante/init.lua-E deleted file mode 100644 index 3ad8158..0000000 --- a/lua/avante/init.lua-E +++ /dev/null @@ -1,424 +0,0 @@ -local api = vim.api - -local Utils = require("avante.utils") -local Sidebar = require("avante.sidebar") -local Selection = require("avante.selection") -local Suggestion = require("avante.suggestion") -local Config = require("avante.config") -local Diff = require("avante.diff") -local RagService = require("avante.rag_service") - ----@class Avante -local M = { - ---@type avante.Sidebar[] we use this to track chat command across tabs - sidebars = {}, - ---@type avante.Selection[] - selections = {}, - ---@type avante.Suggestion[] - suggestions = {}, - ---@type {sidebar?: avante.Sidebar, selection?: avante.Selection, suggestion?: avante.Suggestion} - current = { sidebar = nil, selection = nil, suggestion = nil }, -} - -M.did_setup = false - -local H = {} - -H.load_path = function() - local ok, LazyConfig = pcall(require, "lazy.core.config") - - if ok then - local name = "avante.nvim" - local load_path = function() require("avante_lib").load() end - - if LazyConfig.plugins[name] and LazyConfig.plugins[name]._.loaded then - vim.schedule(load_path) - else - api.nvim_create_autocmd("User", { - pattern = "LazyLoad", - callback = function(event) - if event.data == name then - load_path() - return true - end - end, - }) - end - - api.nvim_create_autocmd("User", { - pattern = "VeryLazy", - callback = load_path, - }) - else - require("avante_lib").load() - end -end - -H.keymaps = function() - vim.keymap.set({ "n", "v" }, "(AvanteAsk)", function() require("avante.api").ask() end, { noremap = true }) - vim.keymap.set( - { "n", "v" }, - "(AvanteChat)", - function() require("avante.api").ask({ ask = false }) end, - { noremap = true } - ) - vim.keymap.set("v", "(AvanteEdit)", function() require("avante.api").edit() end, { noremap = true }) - vim.keymap.set("n", "(AvanteRefresh)", function() require("avante.api").refresh() end, { noremap = true }) - vim.keymap.set("n", "(AvanteFocus)", function() require("avante.api").focus() end, { noremap = true }) - vim.keymap.set("n", "(AvanteBuild)", function() require("avante.api").build() end, { noremap = true }) - vim.keymap.set("n", "(AvanteToggle)", function() M.toggle() end, { noremap = true }) - vim.keymap.set("n", "(AvanteToggleDebug)", function() M.toggle.debug() end) - vim.keymap.set("n", "(AvanteToggleHint)", function() M.toggle.hint() end) - vim.keymap.set("n", "(AvanteToggleSuggestion)", function() M.toggle.suggestion() end) - - vim.keymap.set({ "n", "v" }, "(AvanteConflictOurs)", function() Diff.choose("ours") end) - vim.keymap.set({ "n", "v" }, "(AvanteConflictBoth)", function() Diff.choose("both") end) - vim.keymap.set({ "n", "v" }, "(AvanteConflictTheirs)", function() Diff.choose("theirs") end) - vim.keymap.set({ "n", "v" }, "(AvanteConflictAllTheirs)", function() Diff.choose("all_theirs") end) - vim.keymap.set({ "n", "v" }, "(AvanteConflictCursor)", function() Diff.choose("cursor") end) - vim.keymap.set("n", "(AvanteConflictNextConflict)", function() Diff.find_next("ours") end) - vim.keymap.set("n", "(AvanteConflictPrevConflict)", function() Diff.find_prev("ours") end) - vim.keymap.set("n", "(AvanteSelectModel)", function() require("avante.api").select_model() end) - - if Config.behaviour.auto_set_keymaps then - Utils.safe_keymap_set( - { "n", "v" }, - Config.mappings.ask, - function() require("avante.api").ask() end, - { desc = "avante: ask" } - ) - Utils.safe_keymap_set( - "v", - Config.mappings.edit, - function() require("avante.api").edit() end, - { desc = "avante: edit" } - ) - Utils.safe_keymap_set( - "n", - Config.mappings.refresh, - function() require("avante.api").refresh() end, - { desc = "avante: refresh" } - ) - Utils.safe_keymap_set( - "n", - Config.mappings.focus, - function() require("avante.api").focus() end, - { desc = "avante: focus" } - ) - - Utils.safe_keymap_set("n", Config.mappings.toggle.default, function() M.toggle() end, { desc = "avante: toggle" }) - Utils.safe_keymap_set( - "n", - Config.mappings.toggle.debug, - function() M.toggle.debug() end, - { desc = "avante: toggle debug" } - ) - Utils.safe_keymap_set( - "n", - Config.mappings.toggle.hint, - function() M.toggle.hint() end, - { desc = "avante: toggle hint" } - ) - Utils.safe_keymap_set( - "n", - Config.mappings.toggle.suggestion, - function() M.toggle.suggestion() end, - { desc = "avante: toggle suggestion" } - ) - Utils.safe_keymap_set("n", Config.mappings.toggle.repomap, function() require("avante.repo_map").show() end, { - desc = "avante: display repo map", - noremap = true, - silent = true, - }) - Utils.safe_keymap_set( - "n", - Config.mappings.select_model, - function() require("avante.api").select_model() end, - { desc = "avante: select model" } - ) - end - - if Config.behaviour.auto_suggestions then - Utils.safe_keymap_set("i", Config.mappings.suggestion.accept, function() - local _, _, sg = M.get() - sg:accept() - end, { - desc = "avante: accept suggestion", - noremap = true, - silent = true, - }) - - Utils.safe_keymap_set("i", Config.mappings.suggestion.dismiss, function() - local _, _, sg = M.get() - if sg:is_visible() then sg:dismiss() end - end, { - desc = "avante: dismiss suggestion", - noremap = true, - silent = true, - }) - - Utils.safe_keymap_set("i", Config.mappings.suggestion.next, function() - local _, _, sg = M.get() - sg:next() - end, { - desc = "avante: next suggestion", - noremap = true, - silent = true, - }) - - Utils.safe_keymap_set("i", Config.mappings.suggestion.prev, function() - local _, _, sg = M.get() - sg:prev() - end, { - desc = "avante: previous suggestion", - noremap = true, - silent = true, - }) - end -end - ----@class ApiCaller ----@operator call(...): any - -H.api = function(fun) - return setmetatable({ api = true }, { - __call = function(...) return fun(...) end, - }) --[[@as ApiCaller]] -end - -H.signs = function() vim.fn.sign_define("AvanteInputPromptSign", { text = Config.windows.input.prefix }) end - -H.augroup = api.nvim_create_augroup("avante_autocmds", { clear = true }) - -H.autocmds = function() - api.nvim_create_autocmd("TabEnter", { - group = H.augroup, - pattern = "*", - once = true, - callback = function(ev) - local tab = tonumber(ev.file) - M._init(tab or api.nvim_get_current_tabpage()) - if Config.hints.enabled and not M.current.selection.did_setup then M.current.selection:setup_autocmds() end - end, - }) - - api.nvim_create_autocmd("VimResized", { - group = H.augroup, - callback = function() - local sidebar = M.get() - if not sidebar then return end - if not sidebar:is_open() then return end - sidebar:resize() - end, - }) - - api.nvim_create_autocmd("TabClosed", { - group = H.augroup, - pattern = "*", - callback = function(ev) - local tab = tonumber(ev.file) - local s = M.sidebars[tab] - local sl = M.selections[tab] - if s then s:reset() end - if sl then sl:delete_autocmds() end - if tab ~= nil then M.sidebars[tab] = nil end - end, - }) - - vim.schedule(function() - M._init(api.nvim_get_current_tabpage()) - if Config.hints.enabled then M.current.selection:setup_autocmds() end - end) - - api.nvim_create_autocmd("ColorSchemePre", { - group = H.augroup, - callback = function() require("avante.highlights").setup() end, - }) - - api.nvim_create_autocmd("ColorScheme", { - group = H.augroup, - callback = function() require("avante.highlights").setup() end, - }) - - -- automatically setup Avante filetype to markdown - vim.treesitter.language.register("markdown", "Avante") - - vim.filetype.add({ - extension = { - ["avanterules"] = "jinja", - }, - pattern = { - ["%.avanterules%.[%w_.-]+"] = "jinja", - }, - }) -end - ----@param current boolean? false to disable setting current, otherwise use this to track across tabs. ----@return avante.Sidebar, avante.Selection, avante.Suggestion -function M.get(current) - local tab = api.nvim_get_current_tabpage() - local sidebar = M.sidebars[tab] - local selection = M.selections[tab] - local suggestion = M.suggestions[tab] - if current ~= false then - M.current.sidebar = sidebar - M.current.selection = selection - M.current.suggestion = suggestion - end - return sidebar, selection, suggestion -end - ----@param id integer -function M._init(id) - local sidebar = M.sidebars[id] - local selection = M.selections[id] - local suggestion = M.suggestions[id] - - if not sidebar then - sidebar = Sidebar:new(id) - M.sidebars[id] = sidebar - end - if not selection then - selection = Selection:new(id) - M.selections[id] = selection - end - if not suggestion then - suggestion = Suggestion:new(id) - M.suggestions[id] = suggestion - end - M.current = { sidebar = sidebar, selection = selection, suggestion = suggestion } - return M -end - -M.toggle = { api = true } - ----@param opts? AskOptions -M.toggle_sidebar = function(opts) - opts = opts or {} - if opts.ask == nil then opts.ask = true end - - local sidebar = M.get() - if not sidebar then - M._init(api.nvim_get_current_tabpage()) - ---@cast opts SidebarOpenOptions - M.current.sidebar:open(opts) - return true - end - - return sidebar:toggle(opts) -end - -M.is_sidebar_open = function() - local sidebar = M.get() - if not sidebar then return false end - return sidebar:is_open() -end - ----@param opts? AskOptions -M.open_sidebar = function(opts) - opts = opts or {} - if opts.ask == nil then opts.ask = true end - local sidebar = M.get() - if not sidebar then M._init(api.nvim_get_current_tabpage()) end - ---@cast opts SidebarOpenOptions - M.current.sidebar:open(opts) -end - -M.close_sidebar = function() - local sidebar = M.get() - if not sidebar then return end - sidebar:close() -end - -M.toggle.debug = H.api(Utils.toggle_wrap({ - name = "debug", - get = function() return Config.debug end, - set = function(state) Config.override({ debug = state }) end, -})) - -M.toggle.hint = H.api(Utils.toggle_wrap({ - name = "hint", - get = function() return Config.hints.enabled end, - set = function(state) Config.override({ hints = { enabled = state } }) end, -})) - -M.toggle.suggestion = H.api(Utils.toggle_wrap({ - name = "suggestion", - get = function() return Config.behaviour.auto_suggestions end, - set = function(state) - Config.override({ behaviour = { auto_suggestions = state } }) - local _, _, sg = M.get() - if state ~= false then - if sg then sg:setup_autocmds() end - H.keymaps() - else - if sg then sg:delete_autocmds() end - end - end, -})) - -setmetatable(M.toggle, { - __index = M.toggle, - __call = function() M.toggle_sidebar() end, -}) - ----@param opts? avante.Config -function M.setup(opts) - ---PERF: we can still allow running require("avante").setup() multiple times to override config if users wish to - ---but most of the other functionality will only be called once from lazy.nvim - Config.setup(opts) - - if M.did_setup then return end - - H.load_path() - - require("avante.html2md").setup() - require("avante.repo_map").setup() - require("avante.path").setup() - require("avante.highlights").setup() - require("avante.diff").setup() - require("avante.providers").setup() - require("avante.clipboard").setup() - - -- setup helpers - H.autocmds() - H.keymaps() - H.signs() - - M.did_setup = true - - local function run_rag_service() - local started_at = os.time() - local add_resource_with_delay - local function add_resource() - local is_ready = RagService.is_ready() - if not is_ready then - local elapsed = os.time() - started_at - if elapsed > 1000 * 60 * 15 then - Utils.warn("Rag Service is not ready, giving up") - return - end - add_resource_with_delay() - return - end - vim.defer_fn(function() - Utils.info("Adding project root to Rag Service ...") - local uri = "file://" .. Utils.get_project_root() - if uri:sub(-1) ~= "/" then uri = uri .. "/" end - RagService.add_resource(uri) - Utils.info("Added project root to Rag Service") - end, 5000) - end - add_resource_with_delay = function() - vim.defer_fn(function() add_resource() end, 5000) - end - vim.schedule(function() - Utils.info("Starting Rag Service ...") - RagService.launch_rag_service(add_resource_with_delay) - end) - end - - if Config.rag_service.enabled then run_rag_service() end -end - -return M