From 7bf1a917b78ebc622b6691af9196b95b4a9d3142 Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Wed, 19 Apr 2023 13:15:29 +0100 Subject: vim-patch:8.1.2094: the fileio.c file is too big Problem: The fileio.c file is too big. Solution: Move buf_write() to bufwrite.c. (Yegappan Lakshmanan, closes vim/vim#4990) https://github.com/vim/vim/commit/c079f0fed1c16495d726d616c5362edc04742a0d Co-authored-by: Yegappan Lakshmanan Co-authored-by: zeertzjq --- cmake.config/iwyu/mapping.imp | 1 + 1 file changed, 1 insertion(+) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 4e55aa9875..22710d8571 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -20,6 +20,7 @@ { include: [ '"autocmd.h.generated.h"', private, '"nvim/autocmd.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 ] }, { include: [ '"change.h.generated.h"', private, '"nvim/change.h"', public ] }, { include: [ '"channel.h.generated.h"', private, '"nvim/channel.h"', public ] }, { include: [ '"charset.h.generated.h"', private, '"nvim/charset.h"', public ] }, -- cgit From e2fdd53d8c015913e8be4ff708fc3488558c8906 Mon Sep 17 00:00:00 2001 From: bfredl Date: Sun, 14 May 2023 18:45:56 +0200 Subject: refactor(map): avoid duplicated khash_t types for values This reduces the total number of khash_t instantiations from 22 to 8. Make the khash internal functions take the size of values as a runtime parameter. This is abstracted with typesafe Map containers which are still specialized for both key, value type. Introduce `Set(key)` type for when there is no value. Refactor shada.c to use Map/Set instead of khash directly. This requires `map_ref` operation to be more flexible. Return pointers to both key and value, plus an indicator for new_item. As a bonus, `map_key` is now redundant. Instead of Map(cstr_t, FileMarks), use a pointer map as the FileMarks struct is humongous. Make `event_strings` actually work like an intern pool instead of wtf it was doing before. --- cmake.config/iwyu/mapping.imp | 1 - 1 file changed, 1 deletion(-) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 22710d8571..7cdd63a723 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -194,7 +194,6 @@ { include: [ '"nvim/extmark_defs.h"', public, '"nvim/extmark.h"', public ] }, { include: [ '"nvim/grid_defs.h"', public, '"nvim/grid.h"', public ] }, { include: [ '"nvim/highlight_defs.h"', public, '"nvim/highlight.h"', public ] }, - { include: [ '"nvim/map_defs.h"', public, '"nvim/map.h"', public ] }, { include: [ '"nvim/mark_defs.h"', public, '"nvim/mark.h"', public ] }, { include: [ '"nvim/mbyte_defs.h"', public, '"nvim/mbyte.h"', public ] }, { include: [ '"nvim/memfile_defs.h"', public, '"nvim/memfile.h"', public ] }, -- cgit From cf8b2c0e74fd5e723b0c15c2ce84e6900fd322d3 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 30 Sep 2023 12:05:28 +0800 Subject: build(iwyu): add a few more _defs.h mappings (#25435) --- cmake.config/iwyu/mapping.imp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 7cdd63a723..737b9b0e57 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -9,6 +9,7 @@ { include: [ '"api/private/converter.h.generated.h"', private, '"nvim/api/private/converter.h"', public ] }, { include: [ '"api/private/dispatch.h.generated.h"', private, '"nvim/api/private/dispatch.h"', public ] }, { include: [ '"api/private/helpers.h.generated.h"', private, '"nvim/api/private/helpers.h"', public ] }, + { include: [ '"api/private/validate.h.generated.h"', private, '"nvim/api/private/validate.h"', public ] }, { include: [ '"api/tabpage.h.generated.h"', private, '"nvim/api/tabpage.h"', public ] }, { include: [ '"api/ui.h.generated.h"', private, '"nvim/api/ui.h"', public ] }, { include: [ '"api/vim.h.generated.h"', private, '"nvim/api/vim.h"', public ] }, @@ -85,6 +86,7 @@ { include: [ '"log.h.generated.h"', private, '"nvim/log.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 ] }, { include: [ '"lua/spell.h.generated.h"', private, '"nvim/lua/spell.h"', public ] }, { include: [ '"lua/stdlib.h.generated.h"', private, '"nvim/lua/stdlib.h"', public ] }, { include: [ '"lua/treesitter.h.generated.h"', private, '"nvim/lua/treesitter.h"', public ] }, @@ -188,12 +190,17 @@ # headers on the left, it will use the headers on the right if possible. This # isn't explicitly mentioned in the IWYU docs, this is just my interpretation # of its behavior. + { include: [ '"nvim/arglist_defs.h"', public, '"nvim/arglist.h"', public ] }, { include: [ '"nvim/buffer_defs.h"', public, '"nvim/buffer.h"', public ] }, + { include: [ '"nvim/eval/typval_defs.h"', public, '"nvim/eval/typval.h"', public ] }, { include: [ '"nvim/ex_cmds_defs.h"', public, '"nvim/ex_cmds.h"', public ] }, { include: [ '"nvim/ex_eval_defs.h"', public, '"nvim/ex_eval.h"', public ] }, { include: [ '"nvim/extmark_defs.h"', public, '"nvim/extmark.h"', public ] }, + { include: [ '"nvim/fold_defs.h"', public, '"nvim/fold.h"', public ] }, + { include: [ '"nvim/getchar_defs.h"', public, '"nvim/getchar.h"', public ] }, { include: [ '"nvim/grid_defs.h"', public, '"nvim/grid.h"', public ] }, { include: [ '"nvim/highlight_defs.h"', public, '"nvim/highlight.h"', public ] }, + { include: [ '"nvim/mapping_defs.h"', public, '"nvim/mapping.h"', public ] }, { include: [ '"nvim/mark_defs.h"', public, '"nvim/mark.h"', public ] }, { include: [ '"nvim/mbyte_defs.h"', public, '"nvim/mbyte.h"', public ] }, { include: [ '"nvim/memfile_defs.h"', public, '"nvim/memfile.h"', public ] }, -- cgit From 09a17f91d0d362c6e58bfdbe3ccdeacffb0b44b9 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 2 Oct 2023 10:45:33 +0800 Subject: refactor: move cmdline completion types to cmdexpand_defs.h (#25465) --- cmake.config/iwyu/mapping.imp | 1 + 1 file changed, 1 insertion(+) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 737b9b0e57..030f9520c0 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -192,6 +192,7 @@ # of its behavior. { include: [ '"nvim/arglist_defs.h"', public, '"nvim/arglist.h"', public ] }, { include: [ '"nvim/buffer_defs.h"', public, '"nvim/buffer.h"', public ] }, + { include: [ '"nvim/cmdexpand_defs.h"', public, '"nvim/cmdexpand.h"', public ] }, { include: [ '"nvim/eval/typval_defs.h"', public, '"nvim/eval/typval.h"', public ] }, { include: [ '"nvim/ex_cmds_defs.h"', public, '"nvim/ex_cmds.h"', public ] }, { include: [ '"nvim/ex_eval_defs.h"', public, '"nvim/ex_eval.h"', public ] }, -- cgit From 4d757bbfbb6c0e5280563779c4b4ee1ce9142cf0 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sat, 4 Nov 2023 12:25:50 +0100 Subject: refactor: combine regexp files regext_bt.c and regexp_nfa.c are inlined into regexp.c instead of included as a header. This makes developer tools like clang-tidy and clangd be able to understand the code better. --- cmake.config/iwyu/mapping.imp | 1 - 1 file changed, 1 deletion(-) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 030f9520c0..6aaf52d3ff 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -178,7 +178,6 @@ { include: [ '"os/mem.h.generated.h"', private, '"nvim/os/os.h"', public ] }, { include: [ '"os/stdpaths.h.generated.h"', private, '"nvim/os/os.h"', public ] }, { include: [ '"os/users.h.generated.h"', private, '"nvim/os/os.h"', public ] }, - { include: [ '"regexp_bt.h.generated.h"', private, '"nvim/regexp.h"', public ] }, { include: [ '"ui_events_call.h.generated.h"', private, '"nvim/ui.h"', public ] }, { include: [ '"ui_events_client.h.generated.h"', private, '"nvim/ui_client.h"', public ] }, { include: [ '"ui_events_remote.generated.h"', private, '"nvim/api/ui.h"', public ] }, -- cgit From bb4b4576e384c71890b4df4fa4f1ae76fad3a59d Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 16 Nov 2023 10:55:54 +0800 Subject: refactor: iwyu (#26062) --- cmake.config/iwyu/mapping.imp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cmake.config/iwyu/mapping.imp') 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 ] }, -- cgit From a827003e3052c6d9ee7bdb71518182e9bd76317d Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sat, 25 Nov 2023 11:32:32 +0100 Subject: build: rework IWYU mapping files Create mapping to most of the C spec and some POSIX specific functions. This is more robust than relying files shipped with IWYU. --- cmake.config/iwyu/mapping.imp | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 465ab2118d..5ba6c56127 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -1,4 +1,7 @@ [ + { ref: "c99.imp" }, + { ref: "posix.imp" }, + # Generated to normal headers: header.h.generated.h -> nvim/header.h { include: [ '"api/autocmd.h.generated.h"', private, '"nvim/api/autocmd.h"', public ] }, { include: [ '"api/buffer.h.generated.h"', private, '"nvim/api/buffer.h"', public ] }, @@ -221,28 +224,19 @@ { include: [ '"nvim/tui/input_defs.h"', public, '"nvim/tui/input.h"', public ] }, { include: [ '"nvim/undo_defs.h"', public, '"nvim/undo.h"', public ] }, - # Third party headers - { include: [ "", private, "", public ] }, - { include: [ '', private, '', private ] }, - { include: [ '', private, '', private ] }, - { include: [ '', private, '', private ] }, - { include: [ '', private, '', private ] }, - { include: [ '', private, '', private ] }, - { include: [ '', private, '"nvim/gettext.h"', public ] }, - { include: [ '', private, '', private ] }, - { include: [ '', private, '', private ] }, - { include: [ '', private, '"nvim/os/unix_defs.h"', private ] }, - { include: [ '', private, '', private ] }, - { include: [ '', private, '"nvim/os/unix_defs.h"', private ] }, - { include: [ '', private, '"nvim/os/unix_defs.h"', private ] }, - { include: [ '', private, '', public ] }, - # Symbols { symbol: [ "MAX", private, '"nvim/macros.h"', public ] }, { symbol: [ "MIN", private, '"nvim/macros.h"', public ] }, - { symbol: [ "SEEK_END", private, '', public ] }, - { symbol: [ "SEEK_SET", private, '', public ] }, - { symbol: [ "time_fd", private, '"nvim/globals.h"', public ] }, + + # Third party headers + { include: [ '', public, '"nvim/gettext.h"', public ] }, + { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, + { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, + { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, + { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, + { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, + { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, + { include: [ '', public, '', public ] }, ] # vim: set ft=toml: -- cgit From 6361806aa28edca55ad3316a58bc3e936df9c0eb Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 26 Nov 2023 22:58:52 +0800 Subject: refactor: move garray_T to garray_defs.h (#26227) --- cmake.config/iwyu/mapping.imp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 5ba6c56127..90c4ea36bc 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -198,11 +198,13 @@ { include: [ '"nvim/arglist_defs.h"', public, '"nvim/arglist.h"', public ] }, { include: [ '"nvim/buffer_defs.h"', public, '"nvim/buffer.h"', public ] }, { include: [ '"nvim/cmdexpand_defs.h"', public, '"nvim/cmdexpand.h"', public ] }, + { include: [ '"nvim/decoration_defs.h"', public, '"nvim/decoration.h"', public ] }, { include: [ '"nvim/eval/typval_defs.h"', public, '"nvim/eval/typval.h"', public ] }, { include: [ '"nvim/ex_cmds_defs.h"', public, '"nvim/ex_cmds.h"', public ] }, { include: [ '"nvim/ex_eval_defs.h"', public, '"nvim/ex_eval.h"', public ] }, { include: [ '"nvim/extmark_defs.h"', public, '"nvim/extmark.h"', public ] }, { include: [ '"nvim/fold_defs.h"', public, '"nvim/fold.h"', public ] }, + { include: [ '"nvim/garray_defs.h"', public, '"nvim/garray.h"', public ] }, { include: [ '"nvim/getchar_defs.h"', public, '"nvim/getchar.h"', public ] }, { include: [ '"nvim/grid_defs.h"', public, '"nvim/grid.h"', public ] }, { include: [ '"nvim/highlight_defs.h"', public, '"nvim/highlight.h"', public ] }, -- cgit From 71141e8cf5dfaf5d17610dba57f0e0f319a4850e Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sun, 26 Nov 2023 17:25:35 +0100 Subject: build(IWYU): fix headers for arabic.h --- cmake.config/iwyu/mapping.imp | 1 + 1 file changed, 1 insertion(+) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 90c4ea36bc..9a433714dc 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -195,6 +195,7 @@ # headers on the left, it will use the headers on the right if possible. This # isn't explicitly mentioned in the IWYU docs, this is just my interpretation # of its behavior. + { include: [ '"nvim/arabic_defs.h"', public, '"nvim/arabic.h"', public ] }, { include: [ '"nvim/arglist_defs.h"', public, '"nvim/arglist.h"', public ] }, { include: [ '"nvim/buffer_defs.h"', public, '"nvim/buffer.h"', public ] }, { include: [ '"nvim/cmdexpand_defs.h"', public, '"nvim/cmdexpand.h"', public ] }, -- cgit From c2a5105e88758fc27fbcf49909c7790a75810e8a Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Mon, 27 Nov 2023 00:41:43 +0100 Subject: build(IWYU): remove arabic_defs.h (#26235) A _defs header is only needed if it's included by multiple files. --- cmake.config/iwyu/mapping.imp | 1 - 1 file changed, 1 deletion(-) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 9a433714dc..90c4ea36bc 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -195,7 +195,6 @@ # headers on the left, it will use the headers on the right if possible. This # isn't explicitly mentioned in the IWYU docs, this is just my interpretation # of its behavior. - { include: [ '"nvim/arabic_defs.h"', public, '"nvim/arabic.h"', public ] }, { include: [ '"nvim/arglist_defs.h"', public, '"nvim/arglist.h"', public ] }, { include: [ '"nvim/buffer_defs.h"', public, '"nvim/buffer.h"', public ] }, { include: [ '"nvim/cmdexpand_defs.h"', public, '"nvim/cmdexpand.h"', public ] }, -- cgit From 09541d514dd18bf86f673d3784d406236fcbdad8 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 27 Nov 2023 09:51:26 +0800 Subject: build(IWYU): replace public-to-public mappings with pragmas (#26237) --- cmake.config/iwyu/mapping.imp | 45 ------------------------------------------- 1 file changed, 45 deletions(-) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 90c4ea36bc..c56c9c0352 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -175,10 +175,6 @@ { include: [ '"ex_cmds_enum.generated.h"', private, '"nvim/ex_cmds_defs.h"', public ] }, { include: [ '"keysets.h.generated.h"', private, '"nvim/api/private/helpers.h"', public ] }, { include: [ '"keysets_defs.generated.h"', private, '"nvim/api/private/defs.h"', public ] }, - { include: [ '"nvim/os/pty_process_unix.h"', private, '"nvim/os/pty_process.h"', public ] }, - { include: [ '"nvim/os/pty_process_win.h"', private, '"nvim/os/pty_process.h"', public ] }, - { include: [ '"nvim/os/unix_defs.h"', private, '"nvim/os/os_defs.h"', public ] }, - { include: [ '"nvim/os/win_defs.h"', private, '"nvim/os/os_defs.h"', public ] }, { include: [ '"os/env.h.generated.h"', private, '"nvim/os/os.h"', public ] }, { include: [ '"os/fs.h.generated.h"', private, '"nvim/os/os.h"', public ] }, { include: [ '"os/mem.h.generated.h"', private, '"nvim/os/os.h"', public ] }, @@ -189,55 +185,14 @@ { include: [ '"ui_events_remote.generated.h"', private, '"nvim/api/ui.h"', public ] }, { include: [ '"ui_events_remote.h.generated.h"', private, '"nvim/api/ui.h"', public ] }, - # Def to normal headers: nvim/header_defs.h -> nvim/header.h - # - # This is a public to public mapping, meaning that while IWYU can use the - # headers on the left, it will use the headers on the right if possible. This - # isn't explicitly mentioned in the IWYU docs, this is just my interpretation - # of its behavior. - { include: [ '"nvim/arglist_defs.h"', public, '"nvim/arglist.h"', public ] }, - { include: [ '"nvim/buffer_defs.h"', public, '"nvim/buffer.h"', public ] }, - { include: [ '"nvim/cmdexpand_defs.h"', public, '"nvim/cmdexpand.h"', public ] }, - { include: [ '"nvim/decoration_defs.h"', public, '"nvim/decoration.h"', public ] }, - { include: [ '"nvim/eval/typval_defs.h"', public, '"nvim/eval/typval.h"', public ] }, - { include: [ '"nvim/ex_cmds_defs.h"', public, '"nvim/ex_cmds.h"', public ] }, - { include: [ '"nvim/ex_eval_defs.h"', public, '"nvim/ex_eval.h"', public ] }, - { include: [ '"nvim/extmark_defs.h"', public, '"nvim/extmark.h"', public ] }, - { include: [ '"nvim/fold_defs.h"', public, '"nvim/fold.h"', public ] }, - { include: [ '"nvim/garray_defs.h"', public, '"nvim/garray.h"', public ] }, - { include: [ '"nvim/getchar_defs.h"', public, '"nvim/getchar.h"', public ] }, - { include: [ '"nvim/grid_defs.h"', public, '"nvim/grid.h"', public ] }, - { include: [ '"nvim/highlight_defs.h"', public, '"nvim/highlight.h"', public ] }, - { include: [ '"nvim/mapping_defs.h"', public, '"nvim/mapping.h"', public ] }, - { include: [ '"nvim/mark_defs.h"', public, '"nvim/mark.h"', public ] }, - { include: [ '"nvim/mbyte_defs.h"', public, '"nvim/mbyte.h"', public ] }, - { include: [ '"nvim/memfile_defs.h"', public, '"nvim/memfile.h"', public ] }, - { include: [ '"nvim/memline_defs.h"', public, '"nvim/memline.h"', public ] }, - { include: [ '"nvim/menu_defs.h"', public, '"nvim/menu.h"', public ] }, - { include: [ '"nvim/msgpack/channel_defs.h"', public, '"nvim/msgpack/channel.h"', public ] }, - { include: [ '"nvim/option_defs.h"', public, '"nvim/option.h"', public ] }, - { include: [ '"nvim/os/fs_defs.h"', public, '"nvim/os/fs.h"', public ] }, - { include: [ '"nvim/os/os_defs.h"', public, '"nvim/os/os.h"', public ] }, - { include: [ '"nvim/regexp_defs.h"', public, '"nvim/regexp.h"', public ] }, - { include: [ '"nvim/sign_defs.h"', public, '"nvim/sign.h"', public ] }, - { include: [ '"nvim/spell_defs.h"', public, '"nvim/spell.h"', public ] }, - { include: [ '"nvim/statusline_defs.h"', public, '"nvim/statusline.h"', public ] }, - { include: [ '"nvim/syntax_defs.h"', public, '"nvim/syntax.h"', public ] }, - { include: [ '"nvim/tui/input_defs.h"', public, '"nvim/tui/input.h"', public ] }, - { include: [ '"nvim/undo_defs.h"', public, '"nvim/undo.h"', public ] }, - # Symbols { symbol: [ "MAX", private, '"nvim/macros.h"', public ] }, { symbol: [ "MIN", private, '"nvim/macros.h"', public ] }, # Third party headers - { include: [ '', public, '"nvim/gettext.h"', public ] }, { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, - { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, - { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, - { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, { include: [ '', public, '', public ] }, ] -- cgit From 6343d414369de1f3b259e51438cd4f666d82d3d2 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 27 Nov 2023 11:17:04 +0800 Subject: refactor: move autocmd types to autocmd_defs.h (#26239) --- cmake.config/iwyu/mapping.imp | 2 -- 1 file changed, 2 deletions(-) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index c56c9c0352..5f79addf04 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -171,8 +171,6 @@ # 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 ] }, - { include: [ '"auevents_enum.generated.h"', private, '"nvim/autocmd.h"', public ] }, - { include: [ '"ex_cmds_enum.generated.h"', private, '"nvim/ex_cmds_defs.h"', public ] }, { include: [ '"keysets.h.generated.h"', private, '"nvim/api/private/helpers.h"', public ] }, { include: [ '"keysets_defs.generated.h"', private, '"nvim/api/private/defs.h"', public ] }, { include: [ '"os/env.h.generated.h"', private, '"nvim/os/os.h"', public ] }, -- cgit From 38a20dd89f91c45ec8589bf1c50d50732882d38a Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 27 Nov 2023 20:58:37 +0800 Subject: build(IWYU): replace most private mappings with pragmas (#26247) --- cmake.config/iwyu/mapping.imp | 169 ------------------------------------------ 1 file changed, 169 deletions(-) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 5f79addf04..ae857e87da 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -2,185 +2,16 @@ { ref: "c99.imp" }, { ref: "posix.imp" }, - # Generated to normal headers: header.h.generated.h -> nvim/header.h - { include: [ '"api/autocmd.h.generated.h"', private, '"nvim/api/autocmd.h"', public ] }, - { include: [ '"api/buffer.h.generated.h"', private, '"nvim/api/buffer.h"', public ] }, - { include: [ '"api/command.h.generated.h"', private, '"nvim/api/command.h"', public ] }, - { include: [ '"api/deprecated.h.generated.h"', private, '"nvim/api/deprecated.h"', public ] }, - { include: [ '"api/extmark.h.generated.h"', private, '"nvim/api/extmark.h"', public ] }, - { include: [ '"api/options.h.generated.h"', private, '"nvim/api/options.h"', public ] }, - { include: [ '"api/private/converter.h.generated.h"', private, '"nvim/api/private/converter.h"', public ] }, - { include: [ '"api/private/dispatch.h.generated.h"', private, '"nvim/api/private/dispatch.h"', public ] }, - { include: [ '"api/private/helpers.h.generated.h"', private, '"nvim/api/private/helpers.h"', public ] }, - { include: [ '"api/private/validate.h.generated.h"', private, '"nvim/api/private/validate.h"', public ] }, - { include: [ '"api/tabpage.h.generated.h"', private, '"nvim/api/tabpage.h"', public ] }, - { include: [ '"api/ui.h.generated.h"', private, '"nvim/api/ui.h"', public ] }, - { include: [ '"api/vim.h.generated.h"', private, '"nvim/api/vim.h"', public ] }, - { include: [ '"api/vimscript.h.generated.h"', private, '"nvim/api/vimscript.h"', public ] }, - { include: [ '"api/win_config.h.generated.h"', private, '"nvim/api/win_config.h"', public ] }, - { include: [ '"api/window.h.generated.h"', private, '"nvim/api/window.h"', public ] }, - { 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 ] }, - { include: [ '"change.h.generated.h"', private, '"nvim/change.h"', public ] }, - { include: [ '"channel.h.generated.h"', private, '"nvim/channel.h"', public ] }, - { include: [ '"charset.h.generated.h"', private, '"nvim/charset.h"', public ] }, - { include: [ '"cmdexpand.h.generated.h"', private, '"nvim/cmdexpand.h"', public ] }, - { include: [ '"cmdhist.h.generated.h"', private, '"nvim/cmdhist.h"', public ] }, - { include: [ '"context.h.generated.h"', private, '"nvim/context.h"', public ] }, - { include: [ '"cursor.h.generated.h"', private, '"nvim/cursor.h"', public ] }, - { include: [ '"cursor_shape.h.generated.h"', private, '"nvim/cursor_shape.h"', public ] }, - { include: [ '"debugger.h.generated.h"', private, '"nvim/debugger.h"', public ] }, - { include: [ '"decoration.h.generated.h"', private, '"nvim/decoration.h"', public ] }, - { include: [ '"decoration_provider.h.generated.h"', private, '"nvim/decoration_provider.h"', public ] }, - { include: [ '"diff.h.generated.h"', private, '"nvim/diff.h"', public ] }, - { include: [ '"digraph.h.generated.h"', private, '"nvim/digraph.h"', public ] }, - { include: [ '"drawline.h.generated.h"', private, '"nvim/drawline.h"', public ] }, - { include: [ '"drawscreen.h.generated.h"', private, '"nvim/drawscreen.h"', public ] }, - { include: [ '"edit.h.generated.h"', private, '"nvim/edit.h"', public ] }, - { include: [ '"eval.h.generated.h"', private, '"nvim/eval.h"', public ] }, - { include: [ '"eval/buffer.h.generated.h"', private, '"nvim/eval/buffer.h"', public ] }, - { include: [ '"eval/decode.h.generated.h"', private, '"nvim/eval/decode.h"', public ] }, - { include: [ '"eval/encode.h.generated.h"', private, '"nvim/eval/encode.h"', public ] }, - { include: [ '"eval/executor.h.generated.h"', private, '"nvim/eval/executor.h"', public ] }, - { include: [ '"eval/funcs.h.generated.h"', private, '"nvim/eval/funcs.h"', public ] }, - { include: [ '"eval/typval.h.generated.h"', private, '"nvim/eval/typval.h"', public ] }, - { include: [ '"eval/userfunc.h.generated.h"', private, '"nvim/eval/userfunc.h"', public ] }, - { include: [ '"eval/vars.h.generated.h"', private, '"nvim/eval/vars.h"', public ] }, - { include: [ '"eval/window.h.generated.h"', private, '"nvim/eval/window.h"', public ] }, - { include: [ '"event/libuv_process.h.generated.h"', private, '"nvim/event/libuv_process.h"', public ] }, - { include: [ '"event/loop.h.generated.h"', private, '"nvim/event/loop.h"', public ] }, - { include: [ '"event/multiqueue.h.generated.h"', private, '"nvim/event/multiqueue.h"', public ] }, - { include: [ '"event/process.h.generated.h"', private, '"nvim/event/process.h"', public ] }, - { include: [ '"event/rstream.h.generated.h"', private, '"nvim/event/rstream.h"', public ] }, - { include: [ '"event/signal.h.generated.h"', private, '"nvim/event/signal.h"', public ] }, - { include: [ '"event/socket.h.generated.h"', private, '"nvim/event/socket.h"', public ] }, - { include: [ '"event/stream.h.generated.h"', private, '"nvim/event/stream.h"', public ] }, - { include: [ '"event/time.h.generated.h"', private, '"nvim/event/time.h"', public ] }, - { include: [ '"event/wstream.h.generated.h"', private, '"nvim/event/wstream.h"', public ] }, - { include: [ '"ex_cmds.h.generated.h"', private, '"nvim/ex_cmds.h"', public ] }, - { include: [ '"ex_cmds2.h.generated.h"', private, '"nvim/ex_cmds2.h"', public ] }, - { include: [ '"ex_docmd.h.generated.h"', private, '"nvim/ex_docmd.h"', public ] }, - { include: [ '"ex_eval.h.generated.h"', private, '"nvim/ex_eval.h"', public ] }, - { include: [ '"ex_getln.h.generated.h"', private, '"nvim/ex_getln.h"', public ] }, - { include: [ '"ex_session.h.generated.h"', private, '"nvim/ex_session.h"', public ] }, - { include: [ '"extmark.h.generated.h"', private, '"nvim/extmark.h"', public ] }, - { include: [ '"file_search.h.generated.h"', private, '"nvim/file_search.h"', public ] }, - { include: [ '"fileio.h.generated.h"', private, '"nvim/fileio.h"', public ] }, - { include: [ '"fold.h.generated.h"', private, '"nvim/fold.h"', public ] }, - { include: [ '"garray.h.generated.h"', private, '"nvim/garray.h"', public ] }, - { include: [ '"getchar.h.generated.h"', private, '"nvim/getchar.h"', public ] }, - { include: [ '"grid.h.generated.h"', private, '"nvim/grid.h"', public ] }, - { include: [ '"hashtab.h.generated.h"', private, '"nvim/hashtab.h"', public ] }, - { include: [ '"help.h.generated.h"', private, '"nvim/help.h"', public ] }, - { include: [ '"highlight.h.generated.h"', private, '"nvim/highlight.h"', public ] }, - { include: [ '"highlight_group.h.generated.h"', private, '"nvim/highlight_group.h"', public ] }, - { include: [ '"if_cscope.h.generated.h"', private, '"nvim/if_cscope.h"', public ] }, - { include: [ '"indent.h.generated.h"', private, '"nvim/indent.h"', public ] }, - { include: [ '"indent_c.h.generated.h"', private, '"nvim/indent_c.h"', public ] }, - { include: [ '"input.h.generated.h"', private, '"nvim/input.h"', public ] }, - { include: [ '"insexpand.h.generated.h"', private, '"nvim/insexpand.h"', public ] }, - { include: [ '"keycodes.h.generated.h"', private, '"nvim/keycodes.h"', public ] }, - { 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 ] }, - { include: [ '"lua/spell.h.generated.h"', private, '"nvim/lua/spell.h"', public ] }, - { include: [ '"lua/stdlib.h.generated.h"', private, '"nvim/lua/stdlib.h"', public ] }, - { include: [ '"lua/treesitter.h.generated.h"', private, '"nvim/lua/treesitter.h"', public ] }, - { include: [ '"lua/xdiff.h.generated.h"', private, '"nvim/lua/xdiff.h"', public ] }, - { include: [ '"main.h.generated.h"', private, '"nvim/main.h"', public ] }, - { include: [ '"mapping.h.generated.h"', private, '"nvim/mapping.h"', public ] }, - { include: [ '"mark.h.generated.h"', private, '"nvim/mark.h"', public ] }, - { include: [ '"marktree.h.generated.h"', private, '"nvim/marktree.h"', public ] }, - { include: [ '"match.h.generated.h"', private, '"nvim/match.h"', public ] }, - { include: [ '"math.h.generated.h"', private, '"nvim/math.h"', public ] }, - { include: [ '"mbyte.h.generated.h"', private, '"nvim/mbyte.h"', public ] }, - { include: [ '"memfile.h.generated.h"', private, '"nvim/memfile.h"', public ] }, - { include: [ '"memline.h.generated.h"', private, '"nvim/memline.h"', public ] }, - { include: [ '"memory.h.generated.h"', private, '"nvim/memory.h"', public ] }, - { include: [ '"menu.h.generated.h"', private, '"nvim/menu.h"', public ] }, - { include: [ '"message.h.generated.h"', private, '"nvim/message.h"', public ] }, - { include: [ '"mouse.h.generated.h"', private, '"nvim/mouse.h"', public ] }, - { include: [ '"move.h.generated.h"', private, '"nvim/move.h"', public ] }, - { include: [ '"msgpack_rpc/channel.h.generated.h"', private, '"nvim/msgpack_rpc/channel.h"', public ] }, - { include: [ '"msgpack_rpc/helpers.h.generated.h"', private, '"nvim/msgpack_rpc/helpers.h"', public ] }, - { include: [ '"msgpack_rpc/server.h.generated.h"', private, '"nvim/msgpack_rpc/server.h"', public ] }, - { include: [ '"msgpack_rpc/unpacker.h.generated.h"', private, '"nvim/msgpack_rpc/unpacker.h"', public ] }, - { include: [ '"normal.h.generated.h"', private, '"nvim/normal.h"', public ] }, - { include: [ '"ops.h.generated.h"', private, '"nvim/ops.h"', public ] }, - { include: [ '"option.h.generated.h"', private, '"nvim/option.h"', public ] }, - { include: [ '"optionstr.h.generated.h"', private, '"nvim/optionstr.h"', public ] }, - { include: [ '"os/dl.h.generated.h"', private, '"nvim/os/dl.h"', public ] }, - { include: [ '"os/fileio.h.generated.h"', private, '"nvim/os/fileio.h"', public ] }, - { include: [ '"os/fs.h.generated.h"', private, '"nvim/os/fs.h"', public ] }, - { include: [ '"os/input.h.generated.h"', private, '"nvim/os/input.h"', public ] }, - { include: [ '"os/lang.h.generated.h"', private, '"nvim/os/lang.h"', public ] }, - { include: [ '"os/process.h.generated.h"', private, '"nvim/os/process.h"', public ] }, - { include: [ '"os/pty_process_unix.h.generated.h"', private, '"nvim/os/pty_process_unix.h"', private ] }, - { include: [ '"os/shell.h.generated.h"', private, '"nvim/os/shell.h"', public ] }, - { include: [ '"os/signal.h.generated.h"', private, '"nvim/os/signal.h"', public ] }, - { include: [ '"os/time.h.generated.h"', private, '"nvim/os/time.h"', public ] }, - { include: [ '"path.h.generated.h"', private, '"nvim/path.h"', public ] }, - { include: [ '"plines.h.generated.h"', private, '"nvim/plines.h"', public ] }, - { include: [ '"popupmenu.h.generated.h"', private, '"nvim/popupmenu.h"', public ] }, - { include: [ '"profile.h.generated.h"', private, '"nvim/profile.h"', public ] }, - { include: [ '"quickfix.h.generated.h"', private, '"nvim/quickfix.h"', public ] }, - { include: [ '"rbuffer.h.generated.h"', private, '"nvim/rbuffer.h"', public ] }, - { include: [ '"regexp.h.generated.h"', private, '"nvim/regexp.h"', public ] }, - { include: [ '"runtime.h.generated.h"', private, '"nvim/runtime.h"', public ] }, - { include: [ '"screen.h.generated.h"', private, '"nvim/screen.h"', public ] }, - { include: [ '"search.h.generated.h"', private, '"nvim/search.h"', public ] }, - { include: [ '"sha256.h.generated.h"', private, '"nvim/sha256.h"', public ] }, - { include: [ '"shada.h.generated.h"', private, '"nvim/shada.h"', public ] }, - { include: [ '"sign.h.generated.h"', private, '"nvim/sign.h"', public ] }, - { include: [ '"spell.h.generated.h"', private, '"nvim/spell.h"', public ] }, - { include: [ '"spellfile.h.generated.h"', private, '"nvim/spellfile.h"', public ] }, - { include: [ '"spellsuggest.h.generated.h"', private, '"nvim/spellsuggest.h"', public ] }, - { include: [ '"state.h.generated.h"', private, '"nvim/state.h"', public ] }, - { include: [ '"statusline.h.generated.h"', private, '"nvim/statusline.h"', public ] }, - { include: [ '"strings.h.generated.h"', private, '"nvim/strings.h"', public ] }, - { include: [ '"syntax.h.generated.h"', private, '"nvim/syntax.h"', public ] }, - { include: [ '"tag.h.generated.h"', private, '"nvim/tag.h"', public ] }, - { include: [ '"terminal.h.generated.h"', private, '"nvim/terminal.h"', public ] }, - { include: [ '"testing.h.generated.h"', private, '"nvim/testing.h"', public ] }, - { include: [ '"textformat.h.generated.h"', private, '"nvim/textformat.h"', public ] }, - { include: [ '"textobject.h.generated.h"', private, '"nvim/textobject.h"', public ] }, - { include: [ '"tui/input.h.generated.h"', private, '"nvim/tui/input.h"', public ] }, - { include: [ '"tui/terminfo.h.generated.h"', private, '"nvim/tui/terminfo.h"', public ] }, - { include: [ '"tui/tui.h.generated.h"', private, '"nvim/tui/tui.h"', public ] }, - { include: [ '"ugrid.h.generated.h"', private, '"nvim/ugrid.h"', public ] }, - { include: [ '"ui.h.generated.h"', private, '"nvim/ui.h"', public ] }, - { include: [ '"ui_bridge.h.generated.h"', private, '"nvim/ui_bridge.h"', public ] }, - { include: [ '"ui_client.h.generated.h"', private, '"nvim/ui_client.h"', public ] }, - { include: [ '"ui_compositor.h.generated.h"', private, '"nvim/ui_compositor.h"', public ] }, - { include: [ '"undo.h.generated.h"', private, '"nvim/undo.h"', public ] }, - { include: [ '"usercmd.h.generated.h"', private, '"nvim/usercmd.h"', public ] }, - { include: [ '"version.h.generated.h"', private, '"nvim/version.h"', public ] }, - { 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 ] }, { include: [ '"keysets.h.generated.h"', private, '"nvim/api/private/helpers.h"', public ] }, { include: [ '"keysets_defs.generated.h"', private, '"nvim/api/private/defs.h"', public ] }, { include: [ '"os/env.h.generated.h"', private, '"nvim/os/os.h"', public ] }, - { include: [ '"os/fs.h.generated.h"', private, '"nvim/os/os.h"', public ] }, { include: [ '"os/mem.h.generated.h"', private, '"nvim/os/os.h"', public ] }, { include: [ '"os/stdpaths.h.generated.h"', private, '"nvim/os/os.h"', public ] }, { include: [ '"os/users.h.generated.h"', private, '"nvim/os/os.h"', public ] }, { include: [ '"ui_events_call.h.generated.h"', private, '"nvim/ui.h"', public ] }, { include: [ '"ui_events_client.h.generated.h"', private, '"nvim/ui_client.h"', public ] }, - { include: [ '"ui_events_remote.generated.h"', private, '"nvim/api/ui.h"', public ] }, { include: [ '"ui_events_remote.h.generated.h"', private, '"nvim/api/ui.h"', public ] }, # Symbols -- cgit From 40139738eb479d0913ec6ce751ca5adfa50ad8c3 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sun, 26 Nov 2023 21:36:02 +0100 Subject: build: enable IWYU on mac --- cmake.config/iwyu/mapping.imp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index ae857e87da..8c693fecda 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -17,12 +17,11 @@ # Symbols { symbol: [ "MAX", private, '"nvim/macros.h"', public ] }, { symbol: [ "MIN", private, '"nvim/macros.h"', public ] }, + { symbol: [ "extern_proc", private, '', public ] }, + { symbol: [ "iovec", private, '', public ] }, # Third party headers - { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, - { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, - { include: [ '', public, '"nvim/os/unix_defs.h"', private ] }, - { include: [ '', public, '', public ] }, + { include: [ '', private, '', public ] }, ] # vim: set ft=toml: -- cgit From 8b428ca8b79ebb7b36c3e403ff3bcb6924a635a6 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Mon, 27 Nov 2023 16:00:21 +0100 Subject: build(IWYU): fix includes for func_attr.h --- cmake.config/iwyu/mapping.imp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 8c693fecda..401322f948 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -15,6 +15,23 @@ { include: [ '"ui_events_remote.h.generated.h"', private, '"nvim/api/ui.h"', public ] }, # Symbols + { symbol: [ "FUNC_ATTR_ALLOC_ALIGN", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_ALLOC_SIZE", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_ALLOC_SIZE_PROD", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_ALWAYS_INLINE", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_CONST", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_MALLOC", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_NONNULL_ALL", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_NONNULL_ARG", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_NONNULL_RET", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_NORETURN", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_NO_SANITIZE_ADDRESS", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_NO_SANITIZE_UNDEFINED", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_PRINTF", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_PURE", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_UNUSED", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "FUNC_ATTR_WARN_UNUSED_RESULT", private, '"nvim/func_attr.h"', public ] }, + { symbol: [ "MAX", private, '"nvim/macros.h"', public ] }, { symbol: [ "MIN", private, '"nvim/macros.h"', public ] }, { symbol: [ "extern_proc", private, '', public ] }, -- cgit From e38a05369293293b5b510b1b0014fcc2e7cb87f4 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Mon, 27 Nov 2023 18:46:03 +0100 Subject: build(IWYU): export generated headers --- cmake.config/iwyu/mapping.imp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 401322f948..5e34c8883b 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -2,19 +2,6 @@ { ref: "c99.imp" }, { ref: "posix.imp" }, - # 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 ] }, - { include: [ '"keysets.h.generated.h"', private, '"nvim/api/private/helpers.h"', public ] }, - { include: [ '"keysets_defs.generated.h"', private, '"nvim/api/private/defs.h"', public ] }, - { include: [ '"os/env.h.generated.h"', private, '"nvim/os/os.h"', public ] }, - { include: [ '"os/mem.h.generated.h"', private, '"nvim/os/os.h"', public ] }, - { include: [ '"os/stdpaths.h.generated.h"', private, '"nvim/os/os.h"', public ] }, - { include: [ '"os/users.h.generated.h"', private, '"nvim/os/os.h"', public ] }, - { include: [ '"ui_events_call.h.generated.h"', private, '"nvim/ui.h"', public ] }, - { include: [ '"ui_events_client.h.generated.h"', private, '"nvim/ui_client.h"', public ] }, - { include: [ '"ui_events_remote.h.generated.h"', private, '"nvim/api/ui.h"', public ] }, - - # Symbols { symbol: [ "FUNC_ATTR_ALLOC_ALIGN", private, '"nvim/func_attr.h"', public ] }, { symbol: [ "FUNC_ATTR_ALLOC_SIZE", private, '"nvim/func_attr.h"', public ] }, { symbol: [ "FUNC_ATTR_ALLOC_SIZE_PROD", private, '"nvim/func_attr.h"', public ] }, @@ -31,13 +18,12 @@ { symbol: [ "FUNC_ATTR_PURE", private, '"nvim/func_attr.h"', public ] }, { symbol: [ "FUNC_ATTR_UNUSED", private, '"nvim/func_attr.h"', public ] }, { symbol: [ "FUNC_ATTR_WARN_UNUSED_RESULT", private, '"nvim/func_attr.h"', public ] }, - { symbol: [ "MAX", private, '"nvim/macros.h"', public ] }, { symbol: [ "MIN", private, '"nvim/macros.h"', public ] }, { symbol: [ "extern_proc", private, '', public ] }, { symbol: [ "iovec", private, '', public ] }, - # Third party headers + { include: [ '"keysets_defs.generated.h"', private, '"nvim/api/private/dispatch.h"', public ] }, { include: [ '', private, '', public ] }, ] -- cgit From 79b6ff28ad1204fbb4199b9092f5c578d88cb28e Mon Sep 17 00:00:00 2001 From: dundargoc Date: Tue, 28 Nov 2023 20:31:00 +0100 Subject: refactor: fix headers with IWYU --- cmake.config/iwyu/mapping.imp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmake.config/iwyu/mapping.imp') diff --git a/cmake.config/iwyu/mapping.imp b/cmake.config/iwyu/mapping.imp index 5e34c8883b..4056070958 100644 --- a/cmake.config/iwyu/mapping.imp +++ b/cmake.config/iwyu/mapping.imp @@ -18,8 +18,8 @@ { symbol: [ "FUNC_ATTR_PURE", private, '"nvim/func_attr.h"', public ] }, { symbol: [ "FUNC_ATTR_UNUSED", private, '"nvim/func_attr.h"', public ] }, { symbol: [ "FUNC_ATTR_WARN_UNUSED_RESULT", private, '"nvim/func_attr.h"', public ] }, - { symbol: [ "MAX", private, '"nvim/macros.h"', public ] }, - { symbol: [ "MIN", private, '"nvim/macros.h"', public ] }, + { symbol: [ "MAX", private, '"nvim/macros_defs.h"', public ] }, + { symbol: [ "MIN", private, '"nvim/macros_defs.h"', public ] }, { symbol: [ "extern_proc", private, '', public ] }, { symbol: [ "iovec", private, '', public ] }, -- cgit