feat: trigger ModeChanged for terminal modes

2 files changed, 32 insertions, 0 deletions

diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index 35c68fa1f6..30f6ae6f34 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -412,6 +412,7 @@ void terminal_enter(void)
   curwin->w_redr_status = true;  // For mode() in statusline. #8323
   ui_busy_start();
   apply_autocmds(EVENT_TERMENTER, NULL, NULL, false, curbuf);
+  trigger_modechanged();
 
   s->state.execute = terminal_execute;
   s->state.check = terminal_check;
diff --git a/test/functional/autocmd/modechanged_spec.lua b/test/functional/autocmd/modechanged_spec.lua
new file mode 100644
index 0000000000..be5a291ac9
--- /dev/null
+++ b/test/functional/autocmd/modechanged_spec.lua
@@ -0,0 +1,31 @@
+local helpers = require('test.functional.helpers')(after_each)
+local clear, eval, eq = helpers.clear, helpers.eval, helpers.eq
+local feed, command = helpers.feed, helpers.command
+
+describe('ModeChanged', function()
+  before_each(function()
+    clear()
+    command('let g:count = 0')
+    command('au ModeChanged * let g:event = copy(v:event)')
+    command('au ModeChanged * let g:count += 1')
+  end)
+
+  it('picks up terminal mode changes', function()
+    command("term")
+    feed('i')
+    eq({
+      old_mode = 'nt',
+      new_mode = 't'
+    }, eval('g:event'))
+    feed('<c-\\><c-n>')
+    eq({
+      old_mode = 't',
+      new_mode = 'nt'
+    }, eval('g:event'))
+    eq(3, eval('g:count'))
+    command("bd!")
+
+    -- v:event is cleared after the autocommand is done
+    eq({}, eval('v:event'))
+  end)
+end)