diff options
37 files changed, 39 insertions, 38 deletions
diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 6aaf52d3ff..465ab2118d 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -19,6 +19,7 @@ { include: [ '"arabic.h.generated.h"', private, '"nvim/arabic.h"', public ] }, { include: [ '"arglist.h.generated.h"', private, '"nvim/arglist.h"', public ] }, { include: [ '"autocmd.h.generated.h"', private, '"nvim/autocmd.h"', public ] }, + { include: [ '"base64.h.generated.h"', private, '"nvim/base64.h"', public ] }, { include: [ '"buffer.h.generated.h"', private, '"nvim/buffer.h"', public ] }, { include: [ '"buffer_updates.h.generated.h"', private, '"nvim/buffer_updates.h"', public ] }, { include: [ '"bufwrite.h.generated.h"', private, '"nvim/bufwrite.h"', public ] }, @@ -84,6 +85,7 @@ { include: [ '"linematch.h.generated.h"', private, '"nvim/linematch.h"', public ] }, { include: [ '"locale.h.generated.h"', private, '"nvim/locale.h"', public ] }, { include: [ '"log.h.generated.h"', private, '"nvim/log.h"', public ] }, + { include: [ '"lua/base64.h.generated.h"', private, '"nvim/lua/base64.h"', public ] }, { include: [ '"lua/converter.h.generated.h"', private, '"nvim/lua/converter.h"', public ] }, { include: [ '"lua/executor.h.generated.h"', private, '"nvim/lua/executor.h"', public ] }, { include: [ '"lua/secure.h.generated.h"', private, '"nvim/lua/secure.h"', public ] }, @@ -162,6 +164,7 @@ { include: [ '"viml/parser/expressions.h.generated.h"', private, '"nvim/viml/parser/expressions.h"', public ] }, { include: [ '"viml/parser/parser.h.generated.h"', private, '"nvim/viml/parser/parser.h"', public ] }, { include: [ '"window.h.generated.h"', private, '"nvim/window.h"', public ] }, + { include: [ '"winfloat.h.generated.h"', private, '"nvim/winfloat.h"', public ] }, # Generated to normal headers with a different name: header.h.generated.h -> nvim/some_other_header.h { include: [ '"api/private/dispatch_wrappers.h.generated.h"', private, '"nvim/api/private/dispatch.h"', public ] }, diff --git a/src/nvim/api/deprecated.c b/src/nvim/api/deprecated.c index 8398a3a5b1..ff9f8ff18e 100644 --- a/src/nvim/api/deprecated.c +++ b/src/nvim/api/deprecated.c @@ -1,4 +1,3 @@ -#include <limits.h> #include <stdbool.h> #include <stdint.h> #include <string.h> diff --git a/src/nvim/api/options.c b/src/nvim/api/options.c index 61debb70fe..b0053dbb34 100644 --- a/src/nvim/api/options.c +++ b/src/nvim/api/options.c @@ -1,7 +1,6 @@ #include <assert.h> #include <inttypes.h> #include <stdbool.h> -#include <stdlib.h> #include <string.h> #include "nvim/api/keysets.h" @@ -13,9 +12,10 @@ #include "nvim/buffer.h" #include "nvim/eval/window.h" #include "nvim/globals.h" +#include "nvim/macros.h" #include "nvim/memory.h" #include "nvim/option.h" -#include "nvim/types.h" +#include "nvim/option_vars.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/api/private/converter.c b/src/nvim/api/private/converter.c index 1188b04bdc..6e6d054374 100644 --- a/src/nvim/api/private/converter.c +++ b/src/nvim/api/private/converter.c @@ -2,7 +2,6 @@ #include <stdbool.h> #include <stddef.h> #include <stdint.h> -#include <stdlib.h> #include "klib/kvec.h" #include "nvim/api/private/converter.h" diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c index c898925af8..1483650739 100644 --- a/src/nvim/api/ui.c +++ b/src/nvim/api/ui.c @@ -2,6 +2,7 @@ #include <inttypes.h> #include <msgpack/pack.h> #include <stdbool.h> +#include <stddef.h> #include <stdint.h> #include <stdlib.h> #include <string.h> diff --git a/src/nvim/api/win_config.c b/src/nvim/api/win_config.c index 0e6daf6b95..4b16e26103 100644 --- a/src/nvim/api/win_config.c +++ b/src/nvim/api/win_config.c @@ -1,5 +1,4 @@ #include <stdbool.h> -#include <stdlib.h> #include <string.h> #include "klib/kvec.h" diff --git a/src/nvim/arabic.c b/src/nvim/arabic.c index 50ef761066..226b042471 100644 --- a/src/nvim/arabic.c +++ b/src/nvim/arabic.c @@ -19,14 +19,11 @@ #include <stdbool.h> #include <stddef.h> -#include <stdint.h> #include "nvim/arabic.h" #include "nvim/ascii.h" #include "nvim/macros.h" -#include "nvim/mbyte.h" #include "nvim/option_vars.h" -#include "nvim/vim.h" // Unicode values for Arabic characters. enum { diff --git a/src/nvim/base64.c b/src/nvim/base64.c index c647019fb1..8d0c1c4bf1 100644 --- a/src/nvim/base64.c +++ b/src/nvim/base64.c @@ -1,7 +1,9 @@ #include <assert.h> #include <stddef.h> +#include <stdint.h> #include <string.h> +#include "auto/config.h" #include "nvim/base64.h" #include "nvim/memory.h" @@ -9,6 +11,10 @@ # include ENDIAN_INCLUDE_FILE #endif +#ifdef INCLUDE_GENERATED_DECLARATIONS +# include "base64.c.generated.h" // IWYU prgama: export +#endif + static const char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; // Indices are 1-based because we use 0 to indicate a letter that is not part of the alphabet diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 262163f248..6617907f8f 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -84,6 +84,7 @@ #include "nvim/os/time.h" #include "nvim/path.h" #include "nvim/plines.h" +#include "nvim/pos.h" #include "nvim/quickfix.h" #include "nvim/regexp.h" #include "nvim/runtime.h" diff --git a/src/nvim/cmdexpand.c b/src/nvim/cmdexpand.c index cba06976c9..487a3ec482 100644 --- a/src/nvim/cmdexpand.c +++ b/src/nvim/cmdexpand.c @@ -7,7 +7,6 @@ #include <stdlib.h> #include <string.h> -#include "auto/config.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/helpers.h" #include "nvim/arglist.h" @@ -50,7 +49,6 @@ #include "nvim/os/os.h" #include "nvim/path.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" #include "nvim/profile.h" #include "nvim/regexp.h" #include "nvim/runtime.h" diff --git a/src/nvim/cmdhist.c b/src/nvim/cmdhist.c index e2916d1641..be94c08d3a 100644 --- a/src/nvim/cmdhist.c +++ b/src/nvim/cmdhist.c @@ -21,7 +21,6 @@ #include "nvim/memory.h" #include "nvim/message.h" #include "nvim/option_vars.h" -#include "nvim/pos.h" #include "nvim/regexp.h" #include "nvim/strings.h" #include "nvim/types.h" diff --git a/src/nvim/context.c b/src/nvim/context.c index 3114fc8ab5..857f26af37 100644 --- a/src/nvim/context.c +++ b/src/nvim/context.c @@ -16,11 +16,9 @@ #include "nvim/eval/typval.h" #include "nvim/eval/userfunc.h" #include "nvim/ex_docmd.h" -#include "nvim/gettext.h" #include "nvim/hashtab.h" #include "nvim/keycodes.h" #include "nvim/memory.h" -#include "nvim/message.h" #include "nvim/option.h" #include "nvim/shada.h" diff --git a/src/nvim/eval.h b/src/nvim/eval.h index 90e51c5c12..d4bf52c619 100644 --- a/src/nvim/eval.h +++ b/src/nvim/eval.h @@ -2,6 +2,7 @@ #include <stdbool.h> #include <stddef.h> +#include <stdint.h> #include "nvim/buffer_defs.h" #include "nvim/channel.h" diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c index 8cc3903f7a..3fd33720c9 100644 --- a/src/nvim/eval/vars.c +++ b/src/nvim/eval/vars.c @@ -17,7 +17,6 @@ #include "nvim/eval/encode.h" #include "nvim/eval/funcs.h" #include "nvim/eval/typval.h" -#include "nvim/eval/typval_defs.h" #include "nvim/eval/userfunc.h" #include "nvim/eval/vars.h" #include "nvim/eval/window.h" @@ -34,6 +33,7 @@ #include "nvim/message.h" #include "nvim/ops.h" #include "nvim/option.h" +#include "nvim/option_defs.h" #include "nvim/option_vars.h" #include "nvim/os/os.h" #include "nvim/search.h" diff --git a/src/nvim/event/libuv_process.c b/src/nvim/event/libuv_process.c index 73dec2bcab..85fec65177 100644 --- a/src/nvim/event/libuv_process.c +++ b/src/nvim/event/libuv_process.c @@ -8,7 +8,6 @@ #include "nvim/event/process.h" #include "nvim/event/stream.h" #include "nvim/log.h" -#include "nvim/macros.h" #include "nvim/os/os.h" #include "nvim/ui_client.h" diff --git a/src/nvim/event/process.c b/src/nvim/event/process.c index a6646c3a7f..b69612337c 100644 --- a/src/nvim/event/process.c +++ b/src/nvim/event/process.c @@ -1,7 +1,6 @@ #include <assert.h> #include <inttypes.h> #include <signal.h> -#include <stdlib.h> #include <uv.h> #include "klib/klist.h" @@ -10,7 +9,6 @@ #include "nvim/event/process.h" #include "nvim/globals.h" #include "nvim/log.h" -#include "nvim/macros.h" #include "nvim/main.h" #include "nvim/os/process.h" #include "nvim/os/pty_process.h" diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c index 62326de075..542fb707fd 100644 --- a/src/nvim/event/socket.c +++ b/src/nvim/event/socket.c @@ -12,7 +12,6 @@ #include "nvim/event/stream.h" #include "nvim/gettext.h" #include "nvim/log.h" -#include "nvim/macros.h" #include "nvim/main.h" #include "nvim/memory.h" #include "nvim/os/os.h" diff --git a/src/nvim/event/stream.c b/src/nvim/event/stream.c index 49b5be23c8..17c1b0a072 100644 --- a/src/nvim/event/stream.c +++ b/src/nvim/event/stream.c @@ -7,7 +7,6 @@ #include "nvim/event/loop.h" #include "nvim/event/stream.h" #include "nvim/log.h" -#include "nvim/macros.h" #include "nvim/rbuffer.h" #ifdef MSWIN # include "nvim/os/os_win_console.h" diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 94f981dc2b..521f8eb208 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -73,6 +73,7 @@ #include "nvim/os/time.h" #include "nvim/path.h" #include "nvim/plines.h" +#include "nvim/pos.h" #include "nvim/profile.h" #include "nvim/quickfix.h" #include "nvim/regexp.h" diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c index 00abade4b0..4ec5be5157 100644 --- a/src/nvim/ex_eval.c +++ b/src/nvim/ex_eval.c @@ -23,7 +23,6 @@ #include "nvim/memory.h" #include "nvim/message.h" #include "nvim/option_vars.h" -#include "nvim/pos.h" #include "nvim/regexp.h" #include "nvim/runtime.h" #include "nvim/strings.h" diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 69025d81c7..cae3a65825 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -38,7 +38,6 @@ #include "nvim/getchar.h" #include "nvim/gettext.h" #include "nvim/globals.h" -#include "nvim/grid.h" #include "nvim/highlight_defs.h" #include "nvim/highlight_group.h" #include "nvim/keycodes.h" diff --git a/src/nvim/extmark.c b/src/nvim/extmark.c index 17335d7a4b..d24b304270 100644 --- a/src/nvim/extmark.c +++ b/src/nvim/extmark.c @@ -26,11 +26,9 @@ // code for redrawing the line with the deleted decoration. #include <assert.h> -#include <sys/types.h> #include "nvim/api/private/defs.h" #include "nvim/api/private/helpers.h" -#include "nvim/buffer.h" #include "nvim/buffer_defs.h" #include "nvim/buffer_updates.h" #include "nvim/decoration.h" diff --git a/src/nvim/indent.c b/src/nvim/indent.c index 1bf2379bd9..89cf374152 100644 --- a/src/nvim/indent.c +++ b/src/nvim/indent.c @@ -1,5 +1,4 @@ #include <assert.h> -#include <limits.h> #include <stdbool.h> #include <stdint.h> #include <stdlib.h> diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index bd32c6e2dc..28d1c8216e 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -21,7 +21,6 @@ #include "nvim/eval.h" #include "nvim/eval/typval.h" #include "nvim/eval/userfunc.h" -#include "nvim/ex_docmd.h" #include "nvim/ex_eval.h" #include "nvim/ex_getln.h" #include "nvim/fileio.h" diff --git a/src/nvim/linematch.c b/src/nvim/linematch.c index 1524731fab..d835bd5dc1 100644 --- a/src/nvim/linematch.c +++ b/src/nvim/linematch.c @@ -8,6 +8,7 @@ #include "nvim/linematch.h" #include "nvim/macros.h" #include "nvim/memory.h" +#include "nvim/pos.h" #define LN_MAX_BUFS 8 #define LN_DECISION_MAX 255 // pow(2, LN_MAX_BUFS(8)) - 1 = 255 diff --git a/src/nvim/lua/base64.c b/src/nvim/lua/base64.c index 3f246839d5..c1f43a37d7 100644 --- a/src/nvim/lua/base64.c +++ b/src/nvim/lua/base64.c @@ -1,11 +1,16 @@ #include <assert.h> #include <lauxlib.h> #include <lua.h> +#include <stddef.h> #include "nvim/base64.h" #include "nvim/lua/base64.h" #include "nvim/memory.h" +#ifdef INCLUDE_GENERATED_DECLARATIONS +# include "lua/base64.c.generated.h" +#endif + static int nlua_base64_encode(lua_State *L) { if (lua_gettop(L) < 1) { diff --git a/src/nvim/lua/xdiff.c b/src/nvim/lua/xdiff.c index f3f78b79f5..29e3bbefd0 100644 --- a/src/nvim/lua/xdiff.c +++ b/src/nvim/lua/xdiff.c @@ -13,6 +13,7 @@ #include "nvim/lua/xdiff.h" #include "nvim/macros.h" #include "nvim/memory.h" +#include "nvim/pos.h" #include "nvim/vim.h" #include "xdiff/xdiff.h" diff --git a/src/nvim/main.c b/src/nvim/main.c index 00eb6e75a5..818a1313d7 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -65,7 +65,6 @@ #include "nvim/os/stdpaths_defs.h" #include "nvim/path.h" #include "nvim/popupmenu.h" -#include "nvim/pos.h" #include "nvim/profile.h" #include "nvim/quickfix.h" #include "nvim/runtime.h" diff --git a/src/nvim/memory.c b/src/nvim/memory.c index 4c7e42321d..732c9ca39d 100644 --- a/src/nvim/memory.c +++ b/src/nvim/memory.c @@ -657,7 +657,6 @@ char *arena_memdupz(Arena *arena, const char *buf, size_t size) # include "nvim/edit.h" # include "nvim/ex_cmds.h" # include "nvim/ex_docmd.h" -# include "nvim/ex_getln.h" # include "nvim/file_search.h" # include "nvim/getchar.h" # include "nvim/grid.h" diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c index e363f02644..bee08940b4 100644 --- a/src/nvim/optionstr.c +++ b/src/nvim/optionstr.c @@ -3,7 +3,6 @@ #include <stdint.h> #include <string.h> -#include "nvim/api/private/helpers.h" #include "nvim/ascii.h" #include "nvim/autocmd.h" #include "nvim/buffer_defs.h" @@ -15,7 +14,6 @@ #include "nvim/diff.h" #include "nvim/digraph.h" #include "nvim/drawscreen.h" -#include "nvim/eval.h" #include "nvim/eval/typval_defs.h" #include "nvim/eval/userfunc.h" #include "nvim/eval/vars.h" @@ -32,7 +30,6 @@ #include "nvim/memline.h" #include "nvim/memory.h" #include "nvim/message.h" -#include "nvim/mouse.h" #include "nvim/move.h" #include "nvim/option.h" #include "nvim/option_defs.h" @@ -41,13 +38,11 @@ #include "nvim/os/os.h" #include "nvim/pos.h" #include "nvim/regexp.h" -#include "nvim/runtime.h" #include "nvim/spell.h" #include "nvim/spellfile.h" #include "nvim/spellsuggest.h" #include "nvim/strings.h" #include "nvim/types.h" -#include "nvim/ui.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/path.c b/src/nvim/path.c index dc7e0d9645..1cd663bde4 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -29,7 +29,6 @@ #include "nvim/os/os.h" #include "nvim/os/shell.h" #include "nvim/path.h" -#include "nvim/pos.h" #include "nvim/regexp.h" #include "nvim/strings.h" #include "nvim/vim.h" diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 8151d2e12a..48cde447b5 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -7,9 +7,11 @@ // #define REGEXP_DEBUG #include <assert.h> +#include <ctype.h> #include <inttypes.h> #include <limits.h> #include <stdbool.h> +#include <stddef.h> #include <string.h> #include <sys/types.h> @@ -22,6 +24,7 @@ #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/tui/input.c b/src/nvim/tui/input.c index db1281a0b5..ce17d22578 100644 --- a/src/nvim/tui/input.c +++ b/src/nvim/tui/input.c @@ -4,22 +4,20 @@ #include <string.h> #include <uv.h> +#include "klib/kvec.h" #include "nvim/api/private/defs.h" #include "nvim/api/private/helpers.h" -#include "nvim/ascii.h" -#include "nvim/charset.h" #include "nvim/event/defs.h" -#include "nvim/log.h" #include "nvim/macros.h" #include "nvim/main.h" #include "nvim/map.h" #include "nvim/memory.h" #include "nvim/option_vars.h" #include "nvim/os/os.h" +#include "nvim/strings.h" #include "nvim/tui/input.h" #include "nvim/tui/input_defs.h" #include "nvim/tui/tui.h" -#include "nvim/types.h" #include "nvim/ui_client.h" #ifdef MSWIN # include "nvim/os/os_win_console.h" diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c index 56134dd955..ad82b0d783 100644 --- a/src/nvim/tui/tui.c +++ b/src/nvim/tui/tui.c @@ -34,6 +34,7 @@ #include "nvim/tui/input.h" #include "nvim/tui/terminfo.h" #include "nvim/tui/tui.h" +#include "nvim/types.h" #include "nvim/ugrid.h" #include "nvim/ui.h" #include "nvim/ui_client.h" diff --git a/src/nvim/window.c b/src/nvim/window.c index 7742313e84..8ff8053118 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -56,7 +56,6 @@ #include "nvim/option.h" #include "nvim/option_defs.h" #include "nvim/option_vars.h" -#include "nvim/optionstr.h" #include "nvim/os/os.h" #include "nvim/os/os_defs.h" #include "nvim/path.h" diff --git a/src/nvim/winfloat.c b/src/nvim/winfloat.c index d502056699..7fff17e1c4 100644 --- a/src/nvim/winfloat.c +++ b/src/nvim/winfloat.c @@ -1,15 +1,24 @@ +#include <assert.h> #include <stdbool.h> +#include <stdlib.h> +#include <string.h> #include "klib/kvec.h" +#include "nvim/api/private/defs.h" #include "nvim/api/private/helpers.h" +#include "nvim/ascii.h" #include "nvim/buffer_defs.h" #include "nvim/drawscreen.h" #include "nvim/globals.h" #include "nvim/grid.h" +#include "nvim/macros.h" +#include "nvim/memory.h" #include "nvim/mouse.h" #include "nvim/move.h" #include "nvim/option.h" #include "nvim/optionstr.h" +#include "nvim/pos.h" +#include "nvim/strings.h" #include "nvim/ui.h" #include "nvim/vim.h" #include "nvim/window.h" diff --git a/src/nvim/winfloat.h b/src/nvim/winfloat.h index ba13c39551..c66f897ec0 100644 --- a/src/nvim/winfloat.h +++ b/src/nvim/winfloat.h @@ -1,5 +1,6 @@ #pragma once +#include "nvim/api/private/defs.h" #include "nvim/buffer_defs.h" #ifdef INCLUDE_GENERATED_DECLARATIONS |