commit f7cfca49d6f1380b2ec0b0f7723ea308d0810857
parent f5588ee8968c564f6f7b0e42ac0ad44f83489659
Author: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 17 Aug 2022 22:18:34 +0800
refactor: remove some unused includes (#19820)
Replace grid.h in screen.h and screen.h in buffer.h with grid_defs.h
Diffstat:
23 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
@@ -28,6 +28,7 @@
#include "nvim/memory.h"
#include "nvim/move.h"
#include "nvim/ops.h"
+#include "nvim/screen.h"
#include "nvim/undo.h"
#include "nvim/vim.h"
#include "nvim/window.h"
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
@@ -11,6 +11,7 @@
#include "nvim/api/ui.h"
#include "nvim/channel.h"
#include "nvim/cursor_shape.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/map.h"
#include "nvim/memory.h"
@@ -18,7 +19,6 @@
#include "nvim/msgpack_rpc/helpers.h"
#include "nvim/option.h"
#include "nvim/popupmnu.h"
-#include "nvim/screen.h"
#include "nvim/ui.h"
#include "nvim/vim.h"
#include "nvim/window.h"
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
@@ -34,6 +34,7 @@
#include "nvim/fileio.h"
#include "nvim/getchar.h"
#include "nvim/globals.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/highlight_defs.h"
#include "nvim/highlight_group.h"
diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c
@@ -20,6 +20,7 @@
#include "nvim/ex_getln.h"
#include "nvim/fileio.h"
#include "nvim/getchar.h"
+#include "nvim/grid.h"
#include "nvim/insexpand.h"
#include "nvim/lua/executor.h"
#include "nvim/map.h"
@@ -28,6 +29,7 @@
#include "nvim/profile.h"
#include "nvim/regexp.h"
#include "nvim/runtime.h"
+#include "nvim/screen.h"
#include "nvim/search.h"
#include "nvim/state.h"
#include "nvim/ui_compositor.h"
diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h
@@ -4,10 +4,10 @@
#include "nvim/eval/typval.h"
#include "nvim/ex_cmds_defs.h"
#include "nvim/func_attr.h"
+#include "nvim/grid_defs.h" // for StlClickRecord
#include "nvim/macros.h"
#include "nvim/memline.h"
#include "nvim/pos.h" // for linenr_T
-#include "nvim/screen.h" // for StlClickRecord
// Values for buflist_getfile()
enum getf_values {
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
@@ -25,6 +25,7 @@
#include "nvim/fileio.h"
#include "nvim/fold.h"
#include "nvim/getchar.h"
+#include "nvim/grid.h"
#include "nvim/highlight_group.h"
#include "nvim/indent.h"
#include "nvim/indent_c.h"
diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c
@@ -18,6 +18,7 @@
#include "nvim/ex_eval.h"
#include "nvim/ops.h"
#include "nvim/option.h"
+#include "nvim/screen.h"
#include "nvim/search.h"
#include "nvim/window.h"
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
@@ -39,6 +39,7 @@
#include "nvim/garray.h"
#include "nvim/getchar.h"
#include "nvim/globals.h"
+#include "nvim/grid.h"
#include "nvim/help.h"
#include "nvim/highlight.h"
#include "nvim/highlight_defs.h"
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
@@ -20,6 +20,7 @@
#include "nvim/ex_docmd.h"
#include "nvim/fileio.h"
#include "nvim/garray.h"
+#include "nvim/grid.h"
#include "nvim/hardcopy.h"
#include "nvim/highlight_group.h"
#include "nvim/mbyte.h"
@@ -31,7 +32,6 @@
#include "nvim/os/os.h"
#include "nvim/path.h"
#include "nvim/runtime.h"
-#include "nvim/screen.h"
#include "nvim/strings.h"
#include "nvim/syntax.h"
#include "nvim/ui.h"
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
@@ -631,6 +631,7 @@ char *arena_memdupz(Arena *arena, const char *buf, size_t size)
# include "nvim/file_search.h"
# include "nvim/fold.h"
# include "nvim/getchar.h"
+# include "nvim/grid.h"
# include "nvim/mark.h"
# include "nvim/mbyte.h"
# include "nvim/memline.h"
@@ -642,7 +643,6 @@ char *arena_memdupz(Arena *arena, const char *buf, size_t size)
# include "nvim/path.h"
# include "nvim/quickfix.h"
# include "nvim/regexp.h"
-# include "nvim/screen.h"
# include "nvim/search.h"
# include "nvim/spell.h"
# include "nvim/syntax.h"
diff --git a/src/nvim/message.c b/src/nvim/message.c
@@ -23,6 +23,7 @@
#include "nvim/func_attr.h"
#include "nvim/garray.h"
#include "nvim/getchar.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/input.h"
#include "nvim/keycodes.h"
diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c
@@ -9,6 +9,7 @@
#include "nvim/cursor.h"
#include "nvim/diff.h"
#include "nvim/fold.h"
+#include "nvim/grid.h"
#include "nvim/memline.h"
#include "nvim/mouse.h"
#include "nvim/move.h"
diff --git a/src/nvim/move.c b/src/nvim/move.c
@@ -24,6 +24,7 @@
#include "nvim/edit.h"
#include "nvim/fold.h"
#include "nvim/getchar.h"
+#include "nvim/grid.h"
#include "nvim/mbyte.h"
#include "nvim/memline.h"
#include "nvim/move.h"
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
@@ -34,7 +34,7 @@
#include "nvim/fold.h"
#include "nvim/getchar.h"
#include "nvim/globals.h"
-#include "nvim/grid_defs.h"
+#include "nvim/grid.h"
#include "nvim/help.h"
#include "nvim/indent.h"
#include "nvim/keycodes.h"
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
@@ -16,6 +16,7 @@
#include "nvim/edit.h"
#include "nvim/eval/typval.h"
#include "nvim/ex_cmds.h"
+#include "nvim/grid.h"
#include "nvim/insexpand.h"
#include "nvim/memline.h"
#include "nvim/memory.h"
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
@@ -87,7 +87,7 @@
#include "nvim/fold.h"
#include "nvim/garray.h"
#include "nvim/getchar.h"
-#include "nvim/grid_defs.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/highlight_group.h"
#include "nvim/indent.h"
diff --git a/src/nvim/screen.h b/src/nvim/screen.h
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include "nvim/buffer_defs.h"
-#include "nvim/grid.h"
+#include "nvim/grid_defs.h"
#include "nvim/pos.h"
#include "nvim/types.h"
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
@@ -92,6 +92,7 @@
#include "nvim/os_unix.h"
#include "nvim/path.h"
#include "nvim/regexp.h"
+#include "nvim/screen.h"
#include "nvim/search.h"
#include "nvim/spell.h"
#include "nvim/spellfile.h"
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
@@ -17,6 +17,7 @@
#include "nvim/ex_getln.h"
#include "nvim/fold.h"
#include "nvim/garray.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/log.h"
#include "nvim/main.h"
diff --git a/src/nvim/ui_compositor.c b/src/nvim/ui_compositor.c
@@ -13,6 +13,7 @@
#include "nvim/api/private/helpers.h"
#include "nvim/ascii.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/highlight_group.h"
#include "nvim/lib/kvec.h"
@@ -23,7 +24,6 @@
#include "nvim/message.h"
#include "nvim/os/os.h"
#include "nvim/popupmnu.h"
-#include "nvim/screen.h"
#include "nvim/ugrid.h"
#include "nvim/ui.h"
#include "nvim/ui_compositor.h"
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
@@ -107,6 +107,7 @@
#include "nvim/os_unix.h"
#include "nvim/path.h"
#include "nvim/pos.h" // MAXLNUM
+#include "nvim/screen.h"
#include "nvim/sha256.h"
#include "nvim/state.h"
#include "nvim/strings.h"
diff --git a/src/nvim/version.c b/src/nvim/version.c
@@ -14,6 +14,7 @@
#include "nvim/ascii.h"
#include "nvim/buffer.h"
#include "nvim/charset.h"
+#include "nvim/grid.h"
#include "nvim/iconv.h"
#include "nvim/lua/executor.h"
#include "nvim/memline.h"
diff --git a/src/nvim/window.c b/src/nvim/window.c
@@ -26,6 +26,7 @@
#include "nvim/garray.h"
#include "nvim/getchar.h"
#include "nvim/globals.h"
+#include "nvim/grid.h"
#include "nvim/hashtab.h"
#include "nvim/main.h"
#include "nvim/mapping.h"
