refactor(insert): rename edit.c => insert.c #40705

Problem:
- `edit.c` is an unnecessarily misleading and less-discoverable name
  than `insert.c`.
- Numerous insert-mode related things are named with a `ins_` prefix.
- There is already a `insexpand.c` module...

Solution:
Rename `edit.c` => `insert.c`.
This commit is contained in:
Justin M. Keyes authored and GitHub committed 2026-07-12 11:57:17 -04:00
1 parent c1e09659b4
commit 81c4c295ac
31 files changed
+40 -36

No files matched your search

+1 -1
View File
@@ -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
+1 -1
View File
@@ -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';
+4
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+3 -3
View File
@@ -1,4 +1,4 @@
// edit.c: functions for Insert mode
// insert.c: functions for Insert mode
#include <assert.h>
#include <ctype.h>
@@ -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,
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+5 -5
View File
@@ -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('a<cr>12345<esc>')
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<cr><esc>')
feed(':set shiftwidth=2<cr><esc>')
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<cr><esc>')
feed(':set shiftwidth=2<cr><esc>')
feed(':set softtabstop=2<cr><esc>')