From e3f735ef101d670555f44226614a5c3557053b1f Mon Sep 17 00:00:00 2001 From: dundargoc Date: Mon, 27 Nov 2023 20:13:32 +0100 Subject: refactor: fix includes for api/autocmd.h --- src/nvim/api/autocmd.c | 2 +- src/nvim/api/autocmd.h | 2 +- src/nvim/api/buffer.c | 2 +- src/nvim/api/buffer.h | 2 +- src/nvim/api/command.c | 2 +- src/nvim/api/command.h | 2 +- src/nvim/api/deprecated.c | 2 +- src/nvim/api/extmark.c | 2 +- src/nvim/api/extmark.h | 2 +- src/nvim/api/keysets.h | 315 -------------------------------------------- src/nvim/api/keysets_defs.h | 315 ++++++++++++++++++++++++++++++++++++++++++++ src/nvim/api/options.c | 2 +- src/nvim/api/options.h | 2 +- src/nvim/api/vim.c | 2 +- src/nvim/api/vim.h | 2 +- src/nvim/api/vimscript.c | 2 +- src/nvim/api/vimscript.h | 2 +- src/nvim/api/win_config.c | 2 +- src/nvim/api/win_config.h | 2 +- src/nvim/api/window.c | 2 +- src/nvim/api/window.h | 2 +- 21 files changed, 334 insertions(+), 334 deletions(-) delete mode 100644 src/nvim/api/keysets.h create mode 100644 src/nvim/api/keysets_defs.h (limited to 'src/nvim/api') diff --git a/src/nvim/api/autocmd.c b/src/nvim/api/autocmd.c index d2475150f7..96d330f92b 100644 --- a/src/nvim/api/autocmd.c +++ b/src/nvim/api/autocmd.c @@ -8,7 +8,7 @@ #include "klib/kvec.h" #include "nvim/api/autocmd.h" -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/dispatch.h" #include "nvim/api/private/helpers.h" diff --git a/src/nvim/api/autocmd.h b/src/nvim/api/autocmd.h index c2ba59734f..4ab3ddb943 100644 --- a/src/nvim/api/autocmd.h +++ b/src/nvim/api/autocmd.h @@ -2,7 +2,7 @@ #include // IWYU pragma: keep -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" // IWYU pragma: keep #include "nvim/api/private/defs.h" // IWYU pragma: keep #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c index 6bf0aeb4a7..ec667a8953 100644 --- a/src/nvim/api/buffer.c +++ b/src/nvim/api/buffer.c @@ -10,7 +10,7 @@ #include "klib/kvec.h" #include "lua.h" #include "nvim/api/buffer.h" -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/helpers.h" #include "nvim/api/private/validate.h" diff --git a/src/nvim/api/buffer.h b/src/nvim/api/buffer.h index 927afe61d0..557cf8db0c 100644 --- a/src/nvim/api/buffer.h +++ b/src/nvim/api/buffer.h @@ -3,7 +3,7 @@ #include // IWYU pragma: keep #include // IWYU pragma: keep -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" // IWYU pragma: keep #include "nvim/buffer_defs.h" diff --git a/src/nvim/api/command.c b/src/nvim/api/command.c index e44e4052ca..2d3bc26e62 100644 --- a/src/nvim/api/command.c +++ b/src/nvim/api/command.c @@ -6,7 +6,7 @@ #include "klib/kvec.h" #include "nvim/api/command.h" -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/dispatch.h" #include "nvim/api/private/helpers.h" diff --git a/src/nvim/api/command.h b/src/nvim/api/command.h index 7f8c35f89a..95f0e05993 100644 --- a/src/nvim/api/command.h +++ b/src/nvim/api/command.h @@ -2,7 +2,7 @@ #include // IWYU pragma: keep -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" // IWYU pragma: keep #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/api/deprecated.c b/src/nvim/api/deprecated.c index cac7d1ded9..2ec11236d7 100644 --- a/src/nvim/api/deprecated.c +++ b/src/nvim/api/deprecated.c @@ -5,7 +5,7 @@ #include "nvim/api/buffer.h" #include "nvim/api/deprecated.h" #include "nvim/api/extmark.h" -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/options.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/helpers.h" diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c index a05d75e3e6..9a4dfe6788 100644 --- a/src/nvim/api/extmark.c +++ b/src/nvim/api/extmark.c @@ -6,7 +6,7 @@ #include "klib/kvec.h" #include "nvim/api/extmark.h" -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/dispatch.h" #include "nvim/api/private/helpers.h" diff --git a/src/nvim/api/extmark.h b/src/nvim/api/extmark.h index d41a9828be..0a28be98c5 100644 --- a/src/nvim/api/extmark.h +++ b/src/nvim/api/extmark.h @@ -2,7 +2,7 @@ #include // IWYU pragma: keep -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" // IWYU pragma: keep #include "nvim/decoration_defs.h" // IWYU pragma: keep #include "nvim/macros.h" diff --git a/src/nvim/api/keysets.h b/src/nvim/api/keysets.h deleted file mode 100644 index e59eda5686..0000000000 --- a/src/nvim/api/keysets.h +++ /dev/null @@ -1,315 +0,0 @@ -#pragma once - -#include "nvim/api/private/defs.h" - -typedef struct { - OptionalKeys is_set__context_; - Array types; -} Dict(context); - -typedef struct { - OptionalKeys is_set__set_decoration_provider_; - LuaRef on_start; - LuaRef on_buf; - LuaRef on_win; - LuaRef on_line; - LuaRef on_end; - LuaRef _on_hl_def; - LuaRef _on_spell_nav; -} Dict(set_decoration_provider); - -typedef struct { - OptionalKeys is_set__set_extmark_; - Integer id; - Integer end_line; - Integer end_row; - Integer end_col; - Object hl_group; - Array virt_text; - String virt_text_pos; - Integer virt_text_win_col; - Boolean virt_text_hide; - Boolean hl_eol; - String hl_mode; - Boolean invalidate; - Boolean ephemeral; - Integer priority; - Boolean right_gravity; - Boolean end_right_gravity; - Array virt_lines; - Boolean virt_lines_above; - Boolean virt_lines_leftcol; - Boolean strict; - String sign_text; - Object sign_hl_group; - Object number_hl_group; - Object line_hl_group; - Object cursorline_hl_group; - String conceal; - Boolean spell; - Boolean ui_watched; - Boolean undo_restore; -} Dict(set_extmark); - -typedef struct { - OptionalKeys is_set__get_extmarks_; - Integer limit; - Boolean details; - Boolean hl_name; - Boolean overlap; - String type; -} Dict(get_extmarks); - -typedef struct { - OptionalKeys is_set__keymap_; - Boolean noremap; - Boolean nowait; - Boolean silent; - Boolean script; - Boolean expr; - Boolean unique; - LuaRef callback; - String desc; - Boolean replace_keycodes; -} Dict(keymap); - -typedef struct { - Boolean builtin; -} Dict(get_commands); - -typedef struct { - OptionalKeys is_set__user_command_; - Object addr; - Boolean bang; - Boolean bar; - Object complete; - Object count; - Object desc; - Boolean force; - Boolean keepscript; - Object nargs; - Object preview; - Object range; - Boolean register_; -} Dict(user_command); - -typedef struct { - OptionalKeys is_set__float_config_; - Float row; - Float col; - Integer width; - Integer height; - String anchor; - String relative; - Window win; - Array bufpos; - Boolean external; - Boolean focusable; - Integer zindex; - Object border; - Object title; - String title_pos; - Object footer; - String footer_pos; - String style; - Boolean noautocmd; - Boolean fixed; - Boolean hide; -} Dict(float_config); - -typedef struct { - Boolean is_lua; - Boolean do_source; -} Dict(runtime); - -typedef struct { - OptionalKeys is_set__eval_statusline_; - Window winid; - Integer maxwidth; - String fillchar; - Boolean highlights; - Boolean use_winbar; - Boolean use_tabline; - Integer use_statuscol_lnum; -} Dict(eval_statusline); - -typedef struct { - OptionalKeys is_set__option_; - String scope; - Window win; - Buffer buf; - String filetype; -} Dict(option); - -typedef struct { - OptionalKeys is_set__highlight_; - Boolean bold; - Boolean standout; - Boolean strikethrough; - Boolean underline; - Boolean undercurl; - Boolean underdouble; - Boolean underdotted; - Boolean underdashed; - Boolean italic; - Boolean reverse; - Boolean altfont; - Boolean nocombine; - Boolean default_; - Object cterm; - Object foreground; - Object fg; - Object background; - Object bg; - Object ctermfg; - Object ctermbg; - Object special; - Object sp; - Object link; - Object global_link; - Boolean fallback; - Integer blend; - Boolean fg_indexed; - Boolean bg_indexed; - Boolean force; -} Dict(highlight); - -typedef struct { - Boolean bold; - Boolean standout; - Boolean strikethrough; - Boolean underline; - Boolean undercurl; - Boolean underdouble; - Boolean underdotted; - Boolean underdashed; - Boolean italic; - Boolean reverse; - Boolean altfont; - Boolean nocombine; -} Dict(highlight_cterm); - -typedef struct { - OptionalKeys is_set__get_highlight_; - Integer id; - String name; - Boolean link; - Boolean create; -} Dict(get_highlight); - -typedef struct { - OptionalKeys is_set__get_ns_; - Window winid; -} Dict(get_ns); - -typedef struct { - OptionalKeys is_set__win_text_height_; - Integer start_row; - Integer end_row; - Integer start_vcol; - Integer end_vcol; -} Dict(win_text_height); - -typedef struct { - OptionalKeys is_set__clear_autocmds_; - Buffer buffer; - Object event; - Object group; - Object pattern; -} Dict(clear_autocmds); - -typedef struct { - OptionalKeys is_set__create_autocmd_; - Buffer buffer; - Object callback; - String command; - String desc; - Object group; - Boolean nested; - Boolean once; - Object pattern; -} Dict(create_autocmd); - -typedef struct { - OptionalKeys is_set__exec_autocmds_; - Buffer buffer; - Object group; - Boolean modeline; - Object pattern; - Object data; -} Dict(exec_autocmds); - -typedef struct { - OptionalKeys is_set__get_autocmds_; - Object event; - Object group; - Object pattern; - Object buffer; -} Dict(get_autocmds); - -typedef struct { - Object clear; -} Dict(create_augroup); - -typedef struct { - OptionalKeys is_set__cmd_; - String cmd; - Array range; - Integer count; - String reg; - Boolean bang; - Array args; - Dictionary magic; - Dictionary mods; - Object nargs; - Object addr; - Object nextcmd; -} Dict(cmd); - -typedef struct { - OptionalKeys is_set__cmd_magic_; - Boolean file; - Boolean bar; -} Dict(cmd_magic); - -typedef struct { - OptionalKeys is_set__cmd_mods_; - Boolean silent; - Boolean emsg_silent; - Boolean unsilent; - Dictionary filter; - Boolean sandbox; - Boolean noautocmd; - Boolean browse; - Boolean confirm; - Boolean hide; - Boolean horizontal; - Boolean keepalt; - Boolean keepjumps; - Boolean keepmarks; - Boolean keeppatterns; - Boolean lockmarks; - Boolean noswapfile; - Integer tab; - Integer verbose; - Boolean vertical; - String split; -} Dict(cmd_mods); - -typedef struct { - OptionalKeys is_set__cmd_mods_filter_; - String pattern; - Boolean force; -} Dict(cmd_mods_filter); - -typedef struct { - Boolean output; -} Dict(cmd_opts); - -typedef struct { - Boolean verbose; -} Dict(echo_opts); - -typedef struct { - Boolean output; -} Dict(exec_opts); diff --git a/src/nvim/api/keysets_defs.h b/src/nvim/api/keysets_defs.h new file mode 100644 index 0000000000..e59eda5686 --- /dev/null +++ b/src/nvim/api/keysets_defs.h @@ -0,0 +1,315 @@ +#pragma once + +#include "nvim/api/private/defs.h" + +typedef struct { + OptionalKeys is_set__context_; + Array types; +} Dict(context); + +typedef struct { + OptionalKeys is_set__set_decoration_provider_; + LuaRef on_start; + LuaRef on_buf; + LuaRef on_win; + LuaRef on_line; + LuaRef on_end; + LuaRef _on_hl_def; + LuaRef _on_spell_nav; +} Dict(set_decoration_provider); + +typedef struct { + OptionalKeys is_set__set_extmark_; + Integer id; + Integer end_line; + Integer end_row; + Integer end_col; + Object hl_group; + Array virt_text; + String virt_text_pos; + Integer virt_text_win_col; + Boolean virt_text_hide; + Boolean hl_eol; + String hl_mode; + Boolean invalidate; + Boolean ephemeral; + Integer priority; + Boolean right_gravity; + Boolean end_right_gravity; + Array virt_lines; + Boolean virt_lines_above; + Boolean virt_lines_leftcol; + Boolean strict; + String sign_text; + Object sign_hl_group; + Object number_hl_group; + Object line_hl_group; + Object cursorline_hl_group; + String conceal; + Boolean spell; + Boolean ui_watched; + Boolean undo_restore; +} Dict(set_extmark); + +typedef struct { + OptionalKeys is_set__get_extmarks_; + Integer limit; + Boolean details; + Boolean hl_name; + Boolean overlap; + String type; +} Dict(get_extmarks); + +typedef struct { + OptionalKeys is_set__keymap_; + Boolean noremap; + Boolean nowait; + Boolean silent; + Boolean script; + Boolean expr; + Boolean unique; + LuaRef callback; + String desc; + Boolean replace_keycodes; +} Dict(keymap); + +typedef struct { + Boolean builtin; +} Dict(get_commands); + +typedef struct { + OptionalKeys is_set__user_command_; + Object addr; + Boolean bang; + Boolean bar; + Object complete; + Object count; + Object desc; + Boolean force; + Boolean keepscript; + Object nargs; + Object preview; + Object range; + Boolean register_; +} Dict(user_command); + +typedef struct { + OptionalKeys is_set__float_config_; + Float row; + Float col; + Integer width; + Integer height; + String anchor; + String relative; + Window win; + Array bufpos; + Boolean external; + Boolean focusable; + Integer zindex; + Object border; + Object title; + String title_pos; + Object footer; + String footer_pos; + String style; + Boolean noautocmd; + Boolean fixed; + Boolean hide; +} Dict(float_config); + +typedef struct { + Boolean is_lua; + Boolean do_source; +} Dict(runtime); + +typedef struct { + OptionalKeys is_set__eval_statusline_; + Window winid; + Integer maxwidth; + String fillchar; + Boolean highlights; + Boolean use_winbar; + Boolean use_tabline; + Integer use_statuscol_lnum; +} Dict(eval_statusline); + +typedef struct { + OptionalKeys is_set__option_; + String scope; + Window win; + Buffer buf; + String filetype; +} Dict(option); + +typedef struct { + OptionalKeys is_set__highlight_; + Boolean bold; + Boolean standout; + Boolean strikethrough; + Boolean underline; + Boolean undercurl; + Boolean underdouble; + Boolean underdotted; + Boolean underdashed; + Boolean italic; + Boolean reverse; + Boolean altfont; + Boolean nocombine; + Boolean default_; + Object cterm; + Object foreground; + Object fg; + Object background; + Object bg; + Object ctermfg; + Object ctermbg; + Object special; + Object sp; + Object link; + Object global_link; + Boolean fallback; + Integer blend; + Boolean fg_indexed; + Boolean bg_indexed; + Boolean force; +} Dict(highlight); + +typedef struct { + Boolean bold; + Boolean standout; + Boolean strikethrough; + Boolean underline; + Boolean undercurl; + Boolean underdouble; + Boolean underdotted; + Boolean underdashed; + Boolean italic; + Boolean reverse; + Boolean altfont; + Boolean nocombine; +} Dict(highlight_cterm); + +typedef struct { + OptionalKeys is_set__get_highlight_; + Integer id; + String name; + Boolean link; + Boolean create; +} Dict(get_highlight); + +typedef struct { + OptionalKeys is_set__get_ns_; + Window winid; +} Dict(get_ns); + +typedef struct { + OptionalKeys is_set__win_text_height_; + Integer start_row; + Integer end_row; + Integer start_vcol; + Integer end_vcol; +} Dict(win_text_height); + +typedef struct { + OptionalKeys is_set__clear_autocmds_; + Buffer buffer; + Object event; + Object group; + Object pattern; +} Dict(clear_autocmds); + +typedef struct { + OptionalKeys is_set__create_autocmd_; + Buffer buffer; + Object callback; + String command; + String desc; + Object group; + Boolean nested; + Boolean once; + Object pattern; +} Dict(create_autocmd); + +typedef struct { + OptionalKeys is_set__exec_autocmds_; + Buffer buffer; + Object group; + Boolean modeline; + Object pattern; + Object data; +} Dict(exec_autocmds); + +typedef struct { + OptionalKeys is_set__get_autocmds_; + Object event; + Object group; + Object pattern; + Object buffer; +} Dict(get_autocmds); + +typedef struct { + Object clear; +} Dict(create_augroup); + +typedef struct { + OptionalKeys is_set__cmd_; + String cmd; + Array range; + Integer count; + String reg; + Boolean bang; + Array args; + Dictionary magic; + Dictionary mods; + Object nargs; + Object addr; + Object nextcmd; +} Dict(cmd); + +typedef struct { + OptionalKeys is_set__cmd_magic_; + Boolean file; + Boolean bar; +} Dict(cmd_magic); + +typedef struct { + OptionalKeys is_set__cmd_mods_; + Boolean silent; + Boolean emsg_silent; + Boolean unsilent; + Dictionary filter; + Boolean sandbox; + Boolean noautocmd; + Boolean browse; + Boolean confirm; + Boolean hide; + Boolean horizontal; + Boolean keepalt; + Boolean keepjumps; + Boolean keepmarks; + Boolean keeppatterns; + Boolean lockmarks; + Boolean noswapfile; + Integer tab; + Integer verbose; + Boolean vertical; + String split; +} Dict(cmd_mods); + +typedef struct { + OptionalKeys is_set__cmd_mods_filter_; + String pattern; + Boolean force; +} Dict(cmd_mods_filter); + +typedef struct { + Boolean output; +} Dict(cmd_opts); + +typedef struct { + Boolean verbose; +} Dict(echo_opts); + +typedef struct { + Boolean output; +} Dict(exec_opts); diff --git a/src/nvim/api/options.c b/src/nvim/api/options.c index 6b9d3d1130..d08a44b0ad 100644 --- a/src/nvim/api/options.c +++ b/src/nvim/api/options.c @@ -2,7 +2,7 @@ #include #include -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/options.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/dispatch.h" diff --git a/src/nvim/api/options.h b/src/nvim/api/options.h index 2a7385eb56..e44ed44c80 100644 --- a/src/nvim/api/options.h +++ b/src/nvim/api/options.h @@ -2,7 +2,7 @@ #include // IWYU pragma: keep -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" // IWYU pragma: keep #include "nvim/option_defs.h" // IWYU pragma: keep diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 5a206471fa..73001cfb6a 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -11,7 +11,7 @@ #include "klib/kvec.h" #include "nvim/api/buffer.h" #include "nvim/api/deprecated.h" -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/converter.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/dispatch.h" diff --git a/src/nvim/api/vim.h b/src/nvim/api/vim.h index eb165f285f..b2ebacb309 100644 --- a/src/nvim/api/vim.h +++ b/src/nvim/api/vim.h @@ -2,7 +2,7 @@ #include // IWYU pragma: keep -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" // IWYU pragma: keep #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/api/vimscript.c b/src/nvim/api/vimscript.c index b68eba1005..233da2dd9f 100644 --- a/src/nvim/api/vimscript.c +++ b/src/nvim/api/vimscript.c @@ -5,7 +5,7 @@ #include #include "klib/kvec.h" -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/converter.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/helpers.h" diff --git a/src/nvim/api/vimscript.h b/src/nvim/api/vimscript.h index d782f63aec..c068542311 100644 --- a/src/nvim/api/vimscript.h +++ b/src/nvim/api/vimscript.h @@ -2,7 +2,7 @@ #include // IWYU pragma: keep -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" // IWYU pragma: keep #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/api/win_config.c b/src/nvim/api/win_config.c index ee9e75f183..f980c277d1 100644 --- a/src/nvim/api/win_config.c +++ b/src/nvim/api/win_config.c @@ -3,7 +3,7 @@ #include "klib/kvec.h" #include "nvim/api/extmark.h" -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/dispatch.h" #include "nvim/api/private/helpers.h" diff --git a/src/nvim/api/win_config.h b/src/nvim/api/win_config.h index 36f0e2bcf7..47e441a592 100644 --- a/src/nvim/api/win_config.h +++ b/src/nvim/api/win_config.h @@ -2,7 +2,7 @@ #include // IWYU pragma: keep -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" // IWYU pragma: keep #ifdef INCLUDE_GENERATED_DECLARATIONS diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index 44c1c5595c..15460ec368 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -3,7 +3,7 @@ #include #include -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/dispatch.h" #include "nvim/api/private/helpers.h" diff --git a/src/nvim/api/window.h b/src/nvim/api/window.h index 0255193ac7..600d6956b5 100644 --- a/src/nvim/api/window.h +++ b/src/nvim/api/window.h @@ -1,6 +1,6 @@ #pragma once -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" // IWYU pragma: keep #ifdef INCLUDE_GENERATED_DECLARATIONS -- cgit