From d737fa61096593d4ec31f9430939f719d8570001 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Wed, 30 Jul 2025 21:08:10 -0700 Subject: [PATCH] build: remove presubmit dependency on luvit-meta As discussed in https://github.com/yetone/avante.nvim/pull/2536 the project should either use luv bindings from luals or luvit-meta library, but not both, as they conflict with each other (especially with uv.uv_timer_t). Given that other projects such as kickstart.nvim and lazydev.nvim are switching to use the former, we should do the same and drop luvit-meta dependency. Also adjust code that was using luvit-meta's annotations for timers. --- .github/workflows/.luarc.json | 1 - .github/workflows/lua.yaml | 1 - lua/avante/suggestion.lua | 2 +- lua/avante/ui/prompt_input.lua | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/.luarc.json b/.github/workflows/.luarc.json index 8d7c77c..311cd64 100644 --- a/.github/workflows/.luarc.json +++ b/.github/workflows/.luarc.json @@ -10,7 +10,6 @@ "$VIMRUNTIME/lua/vim/lsp", "$PWD/lua", "${3rd}/luv/library", - "$DEPS_PATH/luvit-meta/library", "$DEPS_PATH/lazy.nvim/lua", "$DEPS_PATH/dressing.nvim/lua", "$DEPS_PATH/snacks.nvim/lua", diff --git a/.github/workflows/lua.yaml b/.github/workflows/lua.yaml index 547c475..83d9fff 100644 --- a/.github/workflows/lua.yaml +++ b/.github/workflows/lua.yaml @@ -91,7 +91,6 @@ jobs: "ibhagwan/fzf-lua" "nvim-tree/nvim-web-devicons" "zbirenbaum/copilot.lua" - "Bilal2453/luvit-meta" "folke/lazy.nvim" ) for dep in "${DEPS[@]}"; do diff --git a/lua/avante/suggestion.lua b/lua/avante/suggestion.lua index 6731553..a136523 100644 --- a/lua/avante/suggestion.lua +++ b/lua/avante/suggestion.lua @@ -30,7 +30,7 @@ local SUGGESTION_NS = api.nvim_create_namespace("avante_suggestion") ---@field augroup integer ---@field ignore_patterns table ---@field negate_patterns table ----@field _timer? uv.uv_timer_t | uv_timer_t +---@field _timer? uv.uv_timer_t ---@field _contexts table ---@field is_on_throttle boolean local Suggestion = {} diff --git a/lua/avante/ui/prompt_input.lua b/lua/avante/ui/prompt_input.lua index 0b6ec8b..6b3d3c8 100644 --- a/lua/avante/ui/prompt_input.lua +++ b/lua/avante/ui/prompt_input.lua @@ -15,7 +15,7 @@ local Utils = require("avante.utils") ---@field close_on_submit boolean ---@field spinner_chars table ---@field spinner_index integer ----@field spinner_timer uv_timer_t | nil +---@field spinner_timer uv.uv_timer_t | nil ---@field spinner_active boolean ---@field default_value string | nil ---@field popup_hint_id integer | nil