diff options
Diffstat (limited to 'src')
32 files changed, 40 insertions, 22 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index cf2ee9c6b5..59af5e3818 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -259,9 +259,7 @@ if(ENABLE_IWYU) set(iwyu_flags "${IWYU_PRG};") string(APPEND iwyu_flags "-Xiwyu;--no_default_mappings;") - string(APPEND iwyu_flags "-Xiwyu;--mapping_file=${PROJECT_SOURCE_DIR}/cmake.config/iwyu/mapping.imp;") - string(APPEND iwyu_flags "-Xiwyu;--mapping_file=${PROJECT_SOURCE_DIR}/cmake.config/iwyu/gcc.libc.imp;") - string(APPEND iwyu_flags "-Xiwyu;--mapping_file=${PROJECT_SOURCE_DIR}/cmake.config/iwyu/gcc.symbols.imp") + string(APPEND iwyu_flags "-Xiwyu;--mapping_file=${PROJECT_SOURCE_DIR}/cmake.config/iwyu/mapping.imp") set_target_properties(nvim PROPERTIES C_INCLUDE_WHAT_YOU_USE "${iwyu_flags}") target_compile_definitions(main_lib INTERFACE EXITFREE) diff --git a/src/nvim/api/deprecated.c b/src/nvim/api/deprecated.c index b4aa6fe99e..9ea0de4b89 100644 --- a/src/nvim/api/deprecated.c +++ b/src/nvim/api/deprecated.c @@ -13,6 +13,7 @@ #include "nvim/api/vimscript.h" #include "nvim/buffer_defs.h" #include "nvim/decoration.h" +#include "nvim/decoration_defs.h" #include "nvim/extmark.h" #include "nvim/globals.h" #include "nvim/highlight.h" @@ -21,7 +22,6 @@ #include "nvim/memory.h" #include "nvim/option.h" #include "nvim/pos.h" -#include "nvim/types.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "api/deprecated.c.generated.h" diff --git a/src/nvim/api/extmark.c b/src/nvim/api/extmark.c index 8a2cde8372..d2e387f478 100644 --- a/src/nvim/api/extmark.c +++ b/src/nvim/api/extmark.c @@ -13,6 +13,7 @@ #include "nvim/buffer_defs.h" #include "nvim/charset.h" #include "nvim/decoration.h" +#include "nvim/decoration_defs.h" #include "nvim/decoration_provider.h" #include "nvim/drawscreen.h" #include "nvim/extmark.h" @@ -23,8 +24,6 @@ #include "nvim/memory.h" #include "nvim/pos.h" #include "nvim/sign.h" -#include "nvim/strings.h" -#include "nvim/vim.h" #ifdef INCLUDE_GENERATED_DECLARATIONS # include "api/extmark.c.generated.h" diff --git a/src/nvim/api/win_config.c b/src/nvim/api/win_config.c index 4b16e26103..a35ad57d8f 100644 --- a/src/nvim/api/win_config.c +++ b/src/nvim/api/win_config.c @@ -11,8 +11,8 @@ #include "nvim/autocmd.h" #include "nvim/buffer_defs.h" #include "nvim/decoration.h" +#include "nvim/decoration_defs.h" #include "nvim/drawscreen.h" -#include "nvim/extmark_defs.h" #include "nvim/globals.h" #include "nvim/grid.h" #include "nvim/highlight_group.h" diff --git a/src/nvim/change.c b/src/nvim/change.c index aa58779f5b..f9eeab38c8 100644 --- a/src/nvim/change.c +++ b/src/nvim/change.c @@ -23,7 +23,6 @@ #include "nvim/fold.h" #include "nvim/gettext.h" #include "nvim/globals.h" -#include "nvim/grid_defs.h" #include "nvim/highlight_defs.h" #include "nvim/indent.h" #include "nvim/indent_c.h" diff --git a/src/nvim/charset.c b/src/nvim/charset.c index 9a7de8ecef..d3312516c6 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -19,7 +19,6 @@ #include "nvim/eval/typval_defs.h" #include "nvim/garray.h" #include "nvim/globals.h" -#include "nvim/grid_defs.h" #include "nvim/keycodes.h" #include "nvim/macros.h" #include "nvim/mbyte.h" diff --git a/src/nvim/decoration.c b/src/nvim/decoration.c index 43b07501a0..f860b65c93 100644 --- a/src/nvim/decoration.c +++ b/src/nvim/decoration.c @@ -1,7 +1,13 @@ #include <assert.h> #include <limits.h> +#include <stddef.h> +#include <stdlib.h> +#include <string.h> #include "nvim/api/extmark.h" +#include "nvim/api/private/defs.h" +#include "nvim/api/private/helpers.h" +#include "nvim/ascii.h" #include "nvim/buffer.h" #include "nvim/decoration.h" #include "nvim/drawscreen.h" @@ -9,8 +15,10 @@ #include "nvim/fold.h" #include "nvim/highlight.h" #include "nvim/highlight_group.h" +#include "nvim/mbyte.h" #include "nvim/memory.h" #include "nvim/move.h" +#include "nvim/option_vars.h" #include "nvim/pos.h" #include "nvim/sign.h" diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index 6f34767907..0d405622b6 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -15,12 +15,12 @@ #include "nvim/cursor.h" #include "nvim/cursor_shape.h" #include "nvim/decoration.h" +#include "nvim/decoration_defs.h" #include "nvim/decoration_provider.h" #include "nvim/diff.h" #include "nvim/drawline.h" #include "nvim/drawscreen.h" #include "nvim/eval.h" -#include "nvim/extmark_defs.h" #include "nvim/fold.h" #include "nvim/globals.h" #include "nvim/grid.h" diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c index b28c279163..c6fd186ef2 100644 --- a/src/nvim/drawscreen.c +++ b/src/nvim/drawscreen.c @@ -68,6 +68,7 @@ #include "nvim/cmdexpand.h" #include "nvim/cursor.h" #include "nvim/decoration.h" +#include "nvim/decoration_defs.h" #include "nvim/decoration_provider.h" #include "nvim/diff.h" #include "nvim/digraph.h" @@ -75,7 +76,6 @@ #include "nvim/drawscreen.h" #include "nvim/eval.h" #include "nvim/ex_getln.h" -#include "nvim/extmark_defs.h" #include "nvim/fold.h" #include "nvim/getchar.h" #include "nvim/gettext.h" @@ -99,6 +99,7 @@ #include "nvim/profile.h" #include "nvim/regexp.h" #include "nvim/search.h" +#include "nvim/sign_defs.h" #include "nvim/spell.h" #include "nvim/state.h" #include "nvim/statusline.h" diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index c370224476..2e9dce8b5b 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -8,11 +8,13 @@ #include <msgpack/pack.h> #include <msgpack/unpack.h> #include <signal.h> +#include <stdarg.h> #include <stddef.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/stat.h> +#include <sys/types.h> #include <time.h> #include <uv.h> diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c index 3fd33720c9..cf02bbe224 100644 --- a/src/nvim/eval/vars.c +++ b/src/nvim/eval/vars.c @@ -7,6 +7,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> +#include <sys/types.h> #include "nvim/ascii.h" #include "nvim/autocmd.h" diff --git a/src/nvim/event/libuv_process.c b/src/nvim/event/libuv_process.c index 13d954b92d..2f21fcf2ac 100644 --- a/src/nvim/event/libuv_process.c +++ b/src/nvim/event/libuv_process.c @@ -1,4 +1,5 @@ #include <assert.h> +#include <locale.h> #include <stdint.h> #include <uv.h> diff --git a/src/nvim/event/loop.h b/src/nvim/event/loop.h index 977ed8a1ee..5665332e95 100644 --- a/src/nvim/event/loop.h +++ b/src/nvim/event/loop.h @@ -1,5 +1,6 @@ #pragma once +#include <stdbool.h> #include <stdint.h> #include <uv.h> diff --git a/src/nvim/event/multiqueue.c b/src/nvim/event/multiqueue.c index 328fa68806..677b7e8e6a 100644 --- a/src/nvim/event/multiqueue.c +++ b/src/nvim/event/multiqueue.c @@ -45,7 +45,6 @@ #include <assert.h> #include <stdbool.h> #include <stddef.h> -#include <uv.h> #include "nvim/event/defs.h" #include "nvim/event/multiqueue.h" diff --git a/src/nvim/event/rstream.c b/src/nvim/event/rstream.c index 4721bbdcb7..218293e44a 100644 --- a/src/nvim/event/rstream.c +++ b/src/nvim/event/rstream.c @@ -2,6 +2,7 @@ #include <stdbool.h> #include <stddef.h> #include <stdint.h> +#include <stdio.h> #include <uv.h> #include "nvim/event/loop.h" diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index c406364491..324364a297 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -4,6 +4,7 @@ #include <ctype.h> #include <float.h> #include <inttypes.h> +#include <limits.h> #include <math.h> #include <stdbool.h> #include <stddef.h> @@ -46,7 +47,6 @@ #include "nvim/getchar.h" #include "nvim/gettext.h" #include "nvim/globals.h" -#include "nvim/grid_defs.h" #include "nvim/help.h" #include "nvim/highlight_defs.h" #include "nvim/highlight_group.h" diff --git a/src/nvim/extmark.c b/src/nvim/extmark.c index 08a1539bfc..7bfa7ae62f 100644 --- a/src/nvim/extmark.c +++ b/src/nvim/extmark.c @@ -28,17 +28,16 @@ #include <assert.h> #include "nvim/api/private/defs.h" -#include "nvim/api/private/helpers.h" #include "nvim/buffer_defs.h" #include "nvim/buffer_updates.h" #include "nvim/decoration.h" +#include "nvim/decoration_defs.h" #include "nvim/extmark.h" #include "nvim/extmark_defs.h" #include "nvim/globals.h" #include "nvim/map.h" #include "nvim/marktree.h" #include "nvim/memline.h" -#include "nvim/memory.h" #include "nvim/pos.h" #include "nvim/undo.h" diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 5bf3410614..fce2ddc211 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -11,6 +11,7 @@ #include <stdio.h> #include <string.h> #include <sys/stat.h> +#include <time.h> #include <uv.h> #include "auto/config.h" diff --git a/src/nvim/fold.c b/src/nvim/fold.c index 4c596d9d96..477e4a20cd 100644 --- a/src/nvim/fold.c +++ b/src/nvim/fold.c @@ -20,6 +20,7 @@ #include "nvim/charset.h" #include "nvim/cursor.h" #include "nvim/decoration.h" +#include "nvim/decoration_defs.h" #include "nvim/diff.h" #include "nvim/drawscreen.h" #include "nvim/eval.h" diff --git a/src/nvim/input.c b/src/nvim/input.c index d6ade22fdb..d3ac180ffc 100644 --- a/src/nvim/input.c +++ b/src/nvim/input.c @@ -1,6 +1,7 @@ // input.c: high level functions for prompting the user or input // like yes/no or number prompts. +#include <limits.h> #include <stdbool.h> #include <stdint.h> #include <string.h> diff --git a/src/nvim/lua/stdlib.c b/src/nvim/lua/stdlib.c index a200b0a32f..c1e0af5aa1 100644 --- a/src/nvim/lua/stdlib.c +++ b/src/nvim/lua/stdlib.c @@ -5,8 +5,8 @@ #include <stdbool.h> #include <stddef.h> #include <stdint.h> +#include <stdio.h> #include <string.h> -#include <sys/types.h> #ifdef NVIM_VENDOR_BIT # include "bit.h" diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 92eddb3cf1..37764498c8 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -62,7 +62,6 @@ #include "nvim/option_vars.h" #include "nvim/optionstr.h" #include "nvim/os/os.h" -#include "nvim/os/os_defs.h" #include "nvim/pos.h" #include "nvim/strings.h" #include "nvim/types.h" diff --git a/src/nvim/move.c b/src/nvim/move.c index a719386084..6724ded9d8 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -17,7 +17,6 @@ #include "nvim/buffer.h" #include "nvim/cursor.h" #include "nvim/diff.h" -#include "nvim/drawline.h" #include "nvim/drawscreen.h" #include "nvim/edit.h" #include "nvim/eval/typval.h" @@ -41,6 +40,7 @@ #include "nvim/popupmenu.h" #include "nvim/pos.h" #include "nvim/search.h" +#include "nvim/sign_defs.h" #include "nvim/strings.h" #include "nvim/types.h" #include "nvim/vim.h" diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c index 21803be226..382fdca8fa 100644 --- a/src/nvim/msgpack_rpc/channel.c +++ b/src/nvim/msgpack_rpc/channel.c @@ -7,7 +7,6 @@ #include <stdbool.h> #include <stdio.h> #include <stdlib.h> -#include <uv.h> #include "klib/kvec.h" #include "nvim/api/private/defs.h" diff --git a/src/nvim/option.c b/src/nvim/option.c index 0fae498b25..d4e8328ddd 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -52,7 +52,6 @@ #include "nvim/garray.h" #include "nvim/gettext.h" #include "nvim/globals.h" -#include "nvim/grid_defs.h" #include "nvim/highlight.h" #include "nvim/highlight_group.h" #include "nvim/indent.h" diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index e2a6136ab4..82916eca7b 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -9,6 +9,7 @@ #include <stdlib.h> #include <string.h> #include <sys/stat.h> +#include <sys/types.h> #include <uv.h> #ifdef MSWIN diff --git a/src/nvim/os/unix_defs.h b/src/nvim/os/unix_defs.h index 42d649d773..b90e306932 100644 --- a/src/nvim/os/unix_defs.h +++ b/src/nvim/os/unix_defs.h @@ -1,6 +1,7 @@ #pragma once #include <sys/param.h> +#include <sys/socket.h> #include <unistd.h> #if defined(HAVE_TERMIOS_H) # include <termios.h> diff --git a/src/nvim/plines.c b/src/nvim/plines.c index acbb9637a4..7f6472ab42 100644 --- a/src/nvim/plines.c +++ b/src/nvim/plines.c @@ -8,6 +8,7 @@ #include "nvim/ascii.h" #include "nvim/charset.h" #include "nvim/decoration.h" +#include "nvim/decoration_defs.h" #include "nvim/diff.h" #include "nvim/fold.h" #include "nvim/globals.h" diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index f91d0cabdb..496b93106d 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -24,7 +24,6 @@ #include "nvim/garray.h" #include "nvim/gettext.h" #include "nvim/globals.h" -#include "nvim/grid_defs.h" #include "nvim/keycodes.h" #include "nvim/macros.h" #include "nvim/mark.h" diff --git a/src/nvim/sign.c b/src/nvim/sign.c index 243e9e57cf..af7b2ca5df 100644 --- a/src/nvim/sign.c +++ b/src/nvim/sign.c @@ -1,18 +1,24 @@ // sign.c: functions for managing with signs +#include <assert.h> #include <inttypes.h> #include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "klib/kvec.h" #include "nvim/api/extmark.h" +#include "nvim/api/private/defs.h" +#include "nvim/api/private/helpers.h" #include "nvim/ascii.h" #include "nvim/buffer.h" #include "nvim/buffer_defs.h" #include "nvim/charset.h" #include "nvim/cmdexpand_defs.h" #include "nvim/cursor.h" +#include "nvim/decoration.h" +#include "nvim/decoration_defs.h" #include "nvim/drawscreen.h" #include "nvim/edit.h" #include "nvim/eval/funcs.h" @@ -26,6 +32,8 @@ #include "nvim/highlight_defs.h" #include "nvim/highlight_group.h" #include "nvim/macros.h" +#include "nvim/map.h" +#include "nvim/marktree.h" #include "nvim/mbyte.h" #include "nvim/memory.h" #include "nvim/message.h" diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c index 9d34cf926f..92856d6d8c 100644 --- a/src/nvim/tui/input.c +++ b/src/nvim/tui/input.c @@ -2,7 +2,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <uv.h> #include "klib/kvec.h" #include "nvim/api/private/defs.h" diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 323227d4c0..4bbdea8def 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -34,6 +34,7 @@ #include "nvim/tui/tui.h" #include "nvim/types.h" #include "nvim/ugrid.h" +#include "nvim/ui.h" #include "nvim/ui_client.h" #ifdef MSWIN |