From 4be92ba90d96fa7b77e18bba5e1f1530afef9651 Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Thu, 10 Mar 2022 22:26:41 +0000 Subject: [PATCH] refactor(decorations): unglobal decor_providers Now all the decoration provider code is in one place, decor_providers no longer need to be global. --- src/nvim/decoration_provider.c | 7 +++++++ src/nvim/decoration_provider.h | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/nvim/decoration_provider.c b/src/nvim/decoration_provider.c index e72e1e1a5a..6efcb08b9d 100644 --- a/src/nvim/decoration_provider.c +++ b/src/nvim/decoration_provider.c @@ -9,6 +9,13 @@ #include "nvim/highlight.h" #include "nvim/lua/executor.h" +static kvec_t(DecorProvider) decor_providers = KV_INITIAL_VALUE; + +#define DECORATION_PROVIDER_INIT(ns_id) (DecorProvider) \ + { ns_id, false, LUA_NOREF, LUA_NOREF, \ + LUA_NOREF, LUA_NOREF, LUA_NOREF, \ + LUA_NOREF, -1 } + static bool decor_provider_invoke(NS ns_id, const char *name, LuaRef ref, Array args, bool default_true, char **perr) { diff --git a/src/nvim/decoration_provider.h b/src/nvim/decoration_provider.h index f97beb346b..3ec7c80357 100644 --- a/src/nvim/decoration_provider.h +++ b/src/nvim/decoration_provider.h @@ -2,7 +2,6 @@ #define NVIM_DECORATION_PROVIDER_H #include "nvim/buffer_defs.h" -#include "nvim/extmark_defs.h" typedef struct { NS ns_id; @@ -16,14 +15,8 @@ typedef struct { int hl_valid; } DecorProvider; -#define DECORATION_PROVIDER_INIT(ns_id) (DecorProvider) \ - { ns_id, false, LUA_NOREF, LUA_NOREF, \ - LUA_NOREF, LUA_NOREF, LUA_NOREF, \ - LUA_NOREF, -1 } - typedef kvec_withinit_t(DecorProvider *, 4) DecorProviders; -EXTERN kvec_t(DecorProvider) decor_providers INIT(= KV_INITIAL_VALUE); EXTERN bool provider_active INIT(= false); #ifdef INCLUDE_GENERATED_DECLARATIONS