diff --git a/runtime/doc/dev_arch.txt b/runtime/doc/dev_arch.txt index 8363e22d28..4928ead1ca 100644 --- a/runtime/doc/dev_arch.txt +++ b/runtime/doc/dev_arch.txt @@ -436,7 +436,7 @@ The basic structure described for normal mode in 3, 4 and 5 is used for other modes managed by the `state_enter` loop: - command-line mode: `command_line_{enter,check,execute}()`(`ex_getln.c`) -- insert mode: `insert_{enter,check,execute}()`(`edit.c`) +- insert mode: `insert_{enter,check,execute}()`(`insert.c`) - terminal mode: `terminal_{enter,execute}()`(`terminal.c`) IMPORTANT VARIABLES diff --git a/runtime/doc/dev_tools.txt b/runtime/doc/dev_tools.txt index 3d2a8c6b1d..6dd081fd8f 100644 --- a/runtime/doc/dev_tools.txt +++ b/runtime/doc/dev_tools.txt @@ -31,7 +31,7 @@ You can start hacking on Nvim in less than 5 minutes: Tests that want to check the UI can also use `screen:expect()`. 6. Now make a code change in Nvim itself, then you can see the effects. The example test does `feed('iline1…')`, so let's make a change to the - insert-mode code, which lives in `src/nvim/edit.c`. In the + insert-mode code, which lives in `src/nvim/insert.c`. In the `insert_handle_key` function, just after the `normalchar` label, add this code: > s->c = 'x'; diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index cfe2f54d84..83abfe58fb 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -283,6 +283,10 @@ preprocess_patch() { LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/getchar\.c/\1\/input.c/g' \ "$file" > "$file".tmp && mv "$file".tmp "$file" + # Rename edit.c to insert.c + LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/edit\.c/\1\/insert.c/g' \ + "$file" > "$file".tmp && mv "$file".tmp "$file" + # Rename profiler.c to profile.c LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/profiler\.c/\1\/profile.c/g' \ "$file" > "$file".tmp && mv "$file".tmp "$file" diff --git a/src/nvim/change.c b/src/nvim/change.c index 236cb9cd4c..3c940788a9 100644 --- a/src/nvim/change.c +++ b/src/nvim/change.c @@ -17,7 +17,6 @@ #include "nvim/cursor.h" #include "nvim/diff.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/eval/vars.h" #include "nvim/ex_cmds_defs.h" #include "nvim/extmark.h" @@ -28,6 +27,7 @@ #include "nvim/highlight_defs.h" #include "nvim/indent.h" #include "nvim/indent_c.h" +#include "nvim/insert.h" #include "nvim/insexpand.h" #include "nvim/macros_defs.h" #include "nvim/mark.h" diff --git a/src/nvim/eval.c b/src/nvim/eval.c index e815c450d5..36ed3324dc 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -22,7 +22,6 @@ #include "nvim/cmdexpand_defs.h" #include "nvim/context.h" #include "nvim/cursor.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/encode.h" @@ -45,6 +44,7 @@ #include "nvim/globals.h" #include "nvim/hashtab.h" #include "nvim/highlight_group.h" +#include "nvim/insert.h" #include "nvim/insexpand.h" #include "nvim/keycodes.h" #include "nvim/lib/queue_defs.h" diff --git a/src/nvim/eval/buffer.c b/src/nvim/eval/buffer.c index 396282137e..260837227c 100644 --- a/src/nvim/eval/buffer.c +++ b/src/nvim/eval/buffer.c @@ -13,7 +13,6 @@ #include "nvim/context.h" #include "nvim/cursor.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/eval.h" #include "nvim/eval/buffer.h" #include "nvim/eval/funcs.h" @@ -23,6 +22,7 @@ #include "nvim/ex_cmds.h" #include "nvim/extmark.h" #include "nvim/globals.h" +#include "nvim/insert.h" #include "nvim/macros_defs.h" #include "nvim/memline.h" #include "nvim/memory.h" diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index c1fe8bce79..6ad986ec91 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -35,7 +35,6 @@ #include "nvim/context.h" #include "nvim/cursor.h" #include "nvim/dialog.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval/buffer.h" #include "nvim/eval/decode.h" @@ -69,6 +68,7 @@ #include "nvim/indent_c.h" #include "nvim/input.h" #include "nvim/input_defs.h" +#include "nvim/insert.h" #include "nvim/insexpand.h" #include "nvim/keycodes.h" #include "nvim/lua/executor.h" diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index d28e28dae2..239e7bab9f 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -35,7 +35,6 @@ #include "nvim/diff.h" #include "nvim/digraph.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval/typval.h" #include "nvim/eval/typval_defs.h" @@ -57,6 +56,7 @@ #include "nvim/highlight_group.h" #include "nvim/indent.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/lua/executor.h" #include "nvim/macros_defs.h" #include "nvim/main.h" diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 598e7a9aca..1ebc0c3122 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -37,7 +37,6 @@ #include "nvim/dialog.h" #include "nvim/digraph.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval/fs.h" #include "nvim/eval/funcs.h" @@ -67,6 +66,7 @@ #include "nvim/highlight_defs.h" #include "nvim/highlight_group.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/keycodes.h" #include "nvim/lua/executor.h" #include "nvim/macros_defs.h" diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index a899414ff6..d13900369b 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -28,7 +28,6 @@ #include "nvim/cursor.h" #include "nvim/digraph.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/typval.h" @@ -49,6 +48,7 @@ #include "nvim/highlight_defs.h" #include "nvim/highlight_group.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/keycodes.h" #include "nvim/lua/executor.h" #include "nvim/macros_defs.h" diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 0c97b9d2ec..72a0b9f24a 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -28,7 +28,6 @@ #include "nvim/dialog.h" #include "nvim/diff.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/vars.h" @@ -43,6 +42,7 @@ #include "nvim/highlight_defs.h" #include "nvim/iconv_defs.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/log.h" #include "nvim/macros_defs.h" #include "nvim/mbyte.h" diff --git a/src/nvim/indent.c b/src/nvim/indent.c index ad83540944..005a4ec579 100644 --- a/src/nvim/indent.c +++ b/src/nvim/indent.c @@ -12,7 +12,6 @@ #include "nvim/charset.h" #include "nvim/cursor.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/typval.h" @@ -26,6 +25,7 @@ #include "nvim/globals.h" #include "nvim/indent.h" #include "nvim/indent_c.h" +#include "nvim/insert.h" #include "nvim/mark_defs.h" #include "nvim/mbyte.h" #include "nvim/mbyte_defs.h" diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c index 81b165b5ef..2ec60989af 100644 --- a/src/nvim/indent_c.c +++ b/src/nvim/indent_c.c @@ -8,11 +8,11 @@ #include "nvim/buffer_defs.h" #include "nvim/charset.h" #include "nvim/cursor.h" -#include "nvim/edit.h" #include "nvim/eval/typval.h" #include "nvim/globals.h" #include "nvim/indent.h" #include "nvim/indent_c.h" +#include "nvim/insert.h" #include "nvim/keycodes.h" #include "nvim/macros_defs.h" #include "nvim/mark_defs.h" diff --git a/src/nvim/input.c b/src/nvim/input.c index 801153fec5..f96af3ca4b 100644 --- a/src/nvim/input.c +++ b/src/nvim/input.c @@ -50,7 +50,6 @@ #include "nvim/charset.h" #include "nvim/cursor.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/typval.h" @@ -67,6 +66,7 @@ #include "nvim/gettext_defs.h" #include "nvim/globals.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/insexpand.h" #include "nvim/keycodes.h" #include "nvim/lua/executor.h" diff --git a/src/nvim/edit.c b/src/nvim/insert.c similarity index 99% rename from src/nvim/edit.c rename to src/nvim/insert.c index 0065bba985..7cfa94f4a0 100644 --- a/src/nvim/edit.c +++ b/src/nvim/insert.c @@ -1,4 +1,4 @@ -// edit.c: functions for Insert mode +// insert.c: functions for Insert mode #include #include @@ -22,7 +22,6 @@ #include "nvim/decoration.h" #include "nvim/digraph.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/typval_defs.h" @@ -44,6 +43,7 @@ #include "nvim/indent.h" #include "nvim/indent_c.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/insexpand.h" #include "nvim/keycodes.h" #include "nvim/macros_defs.h" @@ -107,7 +107,7 @@ typedef struct { bool nomove; } InsertState; -#include "edit.c.generated.h" +#include "insert.c.generated.h" enum { BACKSPACE_CHAR = 1, BACKSPACE_WORD = 2, diff --git a/src/nvim/edit.h b/src/nvim/insert.h similarity index 96% rename from src/nvim/edit.h rename to src/nvim/insert.h index f86dde772f..bf9c0ba4b8 100644 --- a/src/nvim/edit.h +++ b/src/nvim/insert.h @@ -34,4 +34,4 @@ enum { INSCHAR_COM_LIST = 16, ///< format comments with list/2nd line indent }; -#include "edit.h.generated.h" +#include "insert.h.generated.h" diff --git a/src/nvim/insexpand.c b/src/nvim/insexpand.c index ae6ca72e79..3b27370750 100644 --- a/src/nvim/insexpand.c +++ b/src/nvim/insexpand.c @@ -22,7 +22,6 @@ #include "nvim/cmdexpand_defs.h" #include "nvim/cursor.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/executor.h" @@ -45,6 +44,7 @@ #include "nvim/indent.h" #include "nvim/indent_c.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/insexpand.h" #include "nvim/keycodes.h" #include "nvim/lua/executor.h" diff --git a/src/nvim/mark.c b/src/nvim/mark.c index dd49276edc..95139c58e7 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -15,7 +15,6 @@ #include "nvim/charset.h" #include "nvim/cursor.h" #include "nvim/diff.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval/typval.h" #include "nvim/eval/typval_defs.h" @@ -26,6 +25,7 @@ #include "nvim/gettext_defs.h" #include "nvim/globals.h" #include "nvim/highlight_defs.h" +#include "nvim/insert.h" #include "nvim/mark.h" #include "nvim/mbyte.h" #include "nvim/memline.h" diff --git a/src/nvim/memory.c b/src/nvim/memory.c index 74109ed41e..2d6d8ac75e 100644 --- a/src/nvim/memory.c +++ b/src/nvim/memory.c @@ -832,12 +832,12 @@ char *arena_strdup(Arena *arena, const char *str) # include "nvim/buffer.h" # include "nvim/cmdhist.h" # include "nvim/diff.h" -# include "nvim/edit.h" # include "nvim/ex_cmds.h" # include "nvim/ex_docmd.h" # include "nvim/file_search.h" # include "nvim/grid.h" # include "nvim/input.h" +# include "nvim/insert.h" # include "nvim/mark.h" # include "nvim/msgpack_rpc/channel.h" # include "nvim/option.h" diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c index d7a25c771a..0339b59e63 100644 --- a/src/nvim/mouse.c +++ b/src/nvim/mouse.c @@ -13,7 +13,6 @@ #include "nvim/decoration.h" #include "nvim/diff.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/eval.h" #include "nvim/eval/typval.h" #include "nvim/eval/vars.h" @@ -23,6 +22,7 @@ #include "nvim/grid.h" #include "nvim/grid_defs.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/keycodes.h" #include "nvim/macros_defs.h" #include "nvim/mark_defs.h" diff --git a/src/nvim/move.c b/src/nvim/move.c index db5d9f1acc..daa093b38f 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -20,7 +20,6 @@ #include "nvim/decoration.h" #include "nvim/diff.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval/typval.h" #include "nvim/eval/window.h" @@ -30,6 +29,7 @@ #include "nvim/grid.h" #include "nvim/grid_defs.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/macros_defs.h" #include "nvim/mark_defs.h" #include "nvim/mbyte.h" diff --git a/src/nvim/normal.c b/src/nvim/normal.c index cbd920e397..8004680be7 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -28,7 +28,6 @@ #include "nvim/diff.h" #include "nvim/digraph.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/vars.h" @@ -48,6 +47,7 @@ #include "nvim/highlight_defs.h" #include "nvim/indent_c.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/keycodes.h" #include "nvim/lua/executor.h" #include "nvim/macros_defs.h" diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 72cbd515e0..d945ecccd7 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -25,7 +25,6 @@ #include "nvim/clipboard.h" #include "nvim/cursor.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/typval.h" @@ -45,6 +44,7 @@ #include "nvim/indent_c.h" #include "nvim/input.h" #include "nvim/input_defs.h" +#include "nvim/insert.h" #include "nvim/keycodes.h" #include "nvim/macros_defs.h" #include "nvim/mark.h" diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 3cf7ddfa43..8d843b87bf 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -21,7 +21,6 @@ #include "nvim/context.h" #include "nvim/cursor.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/typval.h" @@ -45,6 +44,7 @@ #include "nvim/help.h" #include "nvim/highlight_defs.h" #include "nvim/highlight_group.h" +#include "nvim/insert.h" #include "nvim/macros_defs.h" #include "nvim/mark.h" #include "nvim/mbyte.h" diff --git a/src/nvim/register.c b/src/nvim/register.c index 6a7d1014a0..54471c173b 100644 --- a/src/nvim/register.c +++ b/src/nvim/register.c @@ -10,7 +10,6 @@ #include "nvim/clipboard.h" #include "nvim/cursor.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/typval.h" @@ -23,6 +22,7 @@ #include "nvim/globals.h" #include "nvim/indent.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/insexpand.h" #include "nvim/keycodes.h" #include "nvim/mark.h" diff --git a/src/nvim/sign.c b/src/nvim/sign.c index 49f56795a1..50016e5f04 100644 --- a/src/nvim/sign.c +++ b/src/nvim/sign.c @@ -20,7 +20,6 @@ #include "nvim/decoration.h" #include "nvim/decoration_defs.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval/funcs.h" #include "nvim/eval/typval.h" @@ -34,6 +33,7 @@ #include "nvim/grid.h" #include "nvim/highlight_defs.h" #include "nvim/highlight_group.h" +#include "nvim/insert.h" #include "nvim/macros_defs.h" #include "nvim/map_defs.h" #include "nvim/marktree.h" diff --git a/src/nvim/textformat.c b/src/nvim/textformat.c index f12fd85b34..083d43af74 100644 --- a/src/nvim/textformat.c +++ b/src/nvim/textformat.c @@ -10,7 +10,6 @@ #include "nvim/charset.h" #include "nvim/cursor.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/eval.h" #include "nvim/eval/typval_defs.h" #include "nvim/eval/vars.h" @@ -19,6 +18,7 @@ #include "nvim/indent.h" #include "nvim/indent_c.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/macros_defs.h" #include "nvim/mark.h" #include "nvim/mbyte.h" diff --git a/src/nvim/textobject.c b/src/nvim/textobject.c index ae7ccab9ba..0fda512d59 100644 --- a/src/nvim/textobject.c +++ b/src/nvim/textobject.c @@ -10,11 +10,11 @@ #include "nvim/charset.h" #include "nvim/cursor.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/eval/funcs.h" #include "nvim/fold.h" #include "nvim/globals.h" #include "nvim/indent.h" +#include "nvim/insert.h" #include "nvim/mark.h" #include "nvim/mark_defs.h" #include "nvim/mbyte.h" diff --git a/src/nvim/undo.c b/src/nvim/undo.c index 062d8d1b81..5f213774f4 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -91,7 +91,6 @@ #include "nvim/context.h" #include "nvim/cursor.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval/funcs.h" #include "nvim/eval/typval.h" @@ -108,6 +107,7 @@ #include "nvim/globals.h" #include "nvim/highlight_defs.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/macros_defs.h" #include "nvim/mark.h" #include "nvim/mark_defs.h" diff --git a/src/nvim/window.c b/src/nvim/window.c index 92537e6a04..aeb1e53050 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -20,7 +20,6 @@ #include "nvim/decoration.h" #include "nvim/diff.h" #include "nvim/drawscreen.h" -#include "nvim/edit.h" #include "nvim/errors.h" #include "nvim/eval.h" #include "nvim/eval/typval.h" @@ -42,6 +41,7 @@ #include "nvim/grid_defs.h" #include "nvim/hashtab.h" #include "nvim/input.h" +#include "nvim/insert.h" #include "nvim/keycodes.h" #include "nvim/macros_defs.h" #include "nvim/main.h" diff --git a/test/functional/api/extmark_spec.lua b/test/functional/api/extmark_spec.lua index f335ab15a5..28e0d8aa9c 100644 --- a/test/functional/api/extmark_spec.lua +++ b/test/functional/api/extmark_spec.lua @@ -538,7 +538,7 @@ describe('API/extmarks', function() end) it('marks move with char inserts', function() - -- insertchar in edit.c (the ins_str branch) + -- insertchar in insert.c (the ins_str branch) screen = Screen.new(15, 10) set_extmark(ns, marks[1], 0, 3) feed('0') @@ -555,7 +555,7 @@ describe('API/extmarks', function() -- gravity right as definted in tk library it('marks have gravity right', function() - -- insertchar in edit.c (the ins_str branch) + -- insertchar in insert.c (the ins_str branch) set_extmark(ns, marks[1], 0, 2) feed('03l') insert('X') @@ -568,7 +568,7 @@ describe('API/extmarks', function() end) it('we can insert multibyte chars', function() - -- insertchar in edit.c + -- insertchar in insert.c feed('a12345') set_extmark(ns, marks[1], 1, 2) -- Insert a fullwidth (two col) tilde, NICE @@ -896,7 +896,7 @@ describe('API/extmarks', function() end) it('tab works with expandtab', function() - -- ins_tab in edit.c + -- ins_tab in insert.c feed(':set expandtab') feed(':set shiftwidth=2') set_extmark(ns, marks[1], 0, 2) @@ -905,7 +905,7 @@ describe('API/extmarks', function() end) it('tabs work', function() - -- ins_tab in edit.c + -- ins_tab in insert.c feed(':set noexpandtab') feed(':set shiftwidth=2') feed(':set softtabstop=2')