diff options
| author | dundargoc <gocdundar@gmail.com> | 2023-11-27 20:13:32 +0100 |
|---|---|---|
| committer | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-11-27 21:53:07 +0100 |
| commit | e3f735ef101d670555f44226614a5c3557053b1f (patch) | |
| tree | f536343428725139626e15262c6d361157cb2af3 | |
| parent | f9231603c40301ef48ab2cc50e62c9e430b7edf3 (diff) | |
| download | rneovim-e3f735ef101d670555f44226614a5c3557053b1f.tar.gz rneovim-e3f735ef101d670555f44226614a5c3557053b1f.tar.bz2 rneovim-e3f735ef101d670555f44226614a5c3557053b1f.zip | |
refactor: fix includes for api/autocmd.h
30 files changed, 27 insertions, 29 deletions
@@ -142,7 +142,6 @@ iwyu: build/.ran-cmake cmake --preset iwyu cmake --build build > build/iwyu.log iwyu-fix-includes --only_re="src/nvim" --ignore_re="(src/nvim/eval/encode.c|src/nvim/auto/|src/nvim/os/lang.c|src/nvim/map.c\ - |src/nvim/api/autocmd.h\ |src/nvim/api/buffer.h\ |src/nvim/api/command.h\ |src/nvim/api/extmark.h\ diff --git a/src/clint.py b/src/clint.py index 3440e57b59..c6d7d1e8a3 100755 --- a/src/clint.py +++ b/src/clint.py @@ -897,7 +897,6 @@ def CheckIncludes(filename, lines, error): # These should be synced with the ignored headers in the `iwyu` target in # the Makefile. check_includes_ignore = [ - "src/nvim/api/autocmd.h", "src/nvim/api/buffer.h", "src/nvim/api/command.h", "src/nvim/api/extmark.h", 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 <stdint.h> // 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 <lua.h> // IWYU pragma: keep #include <stdint.h> // 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 <stdint.h> // 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 <stdint.h> // 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_defs.h index e59eda5686..e59eda5686 100644 --- a/src/nvim/api/keysets.h +++ b/src/nvim/api/keysets_defs.h 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 <stdbool.h> #include <string.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/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 <stdint.h> // 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 <stdint.h> // 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 <string.h> #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 <stdint.h> // 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 <stdint.h> // 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 <stdint.h> #include <stdlib.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/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 diff --git a/src/nvim/context.c b/src/nvim/context.c index 6d08c38f61..59309fcf16 100644 --- a/src/nvim/context.c +++ b/src/nvim/context.c @@ -6,7 +6,7 @@ #include <stdio.h> #include <string.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/highlight.c b/src/nvim/highlight.c index dcd6e0e8ad..0ea95fc60e 100644 --- a/src/nvim/highlight.c +++ b/src/nvim/highlight.c @@ -5,7 +5,7 @@ #include <lauxlib.h> #include <string.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/highlight.h b/src/nvim/highlight.h index 9212c96bcc..8c8657ae77 100644 --- a/src/nvim/highlight.h +++ b/src/nvim/highlight.h @@ -2,7 +2,7 @@ #include <stdbool.h> -#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" // IWYU pragma: keep #include "nvim/highlight_defs.h" // IWYU pragma: export diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c index aee62f6104..e7518fcde0 100644 --- a/src/nvim/highlight_group.c +++ b/src/nvim/highlight_group.c @@ -8,7 +8,7 @@ #include <string.h> #include "klib/kvec.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/highlight_group.h b/src/nvim/highlight_group.h index 857121b5ca..034de2c533 100644 --- a/src/nvim/highlight_group.h +++ b/src/nvim/highlight_group.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 #include "nvim/api/private/helpers.h" #include "nvim/cmdexpand_defs.h" // IWYU pragma: keep diff --git a/src/nvim/mapping.c b/src/nvim/mapping.c index 0b88ebf965..5d96e678a1 100644 --- a/src/nvim/mapping.c +++ b/src/nvim/mapping.c @@ -10,7 +10,7 @@ #include <stdlib.h> #include <string.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/mapping.h b/src/nvim/mapping.h index 1df05146ef..37f09f2625 100644 --- a/src/nvim/mapping.h +++ b/src/nvim/mapping.h @@ -4,7 +4,7 @@ #include <stddef.h> #include <stdint.h> -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/defs.h" // IWYU pragma: keep #include "nvim/cmdexpand_defs.h" // IWYU pragma: keep #include "nvim/eval/typval_defs.h" // IWYU pragma: keep diff --git a/src/nvim/ui_client.c b/src/nvim/ui_client.c index 3012d6fbee..30f44d182d 100644 --- a/src/nvim/ui_client.c +++ b/src/nvim/ui_client.c @@ -4,7 +4,7 @@ #include <stdint.h> #include <stdlib.h> -#include "nvim/api/keysets.h" +#include "nvim/api/keysets_defs.h" #include "nvim/api/private/dispatch.h" #include "nvim/api/private/helpers.h" #include "nvim/channel.h" |