diff options
| -rw-r--r-- | ci/build.ps1 | 2 | ||||
| -rw-r--r-- | runtime/doc/insert.txt | 7 | ||||
| -rw-r--r-- | src/nvim/terminal.c | 14 | ||||
| -rw-r--r-- | test/functional/terminal/ex_terminal_spec.lua | 7 |
4 files changed, 26 insertions, 4 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1 index 4f2b748284..cbe300cc28 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -29,7 +29,7 @@ if (-Not (Test-Path -PathType container $nvimCmakeVars["DEPS_BUILD_DIR"])) { write-host "cache dir not found: $($nvimCmakeVars['DEPS_BUILD_DIR'])" mkdir $nvimCmakeVars["DEPS_BUILD_DIR"] } else { - write-host "cache dir ($nvimCmakeVars['DEPS_BUILD_DIR']) size: $(Get-ChildItem $nvimCmakeVars['DEPS_BUILD_DIR'] -recurse | Measure-Object -property length -sum | Select -expand sum)" + write-host "cache dir $($nvimCmakeVars['DEPS_BUILD_DIR']) size: $(Get-ChildItem $nvimCmakeVars['DEPS_BUILD_DIR'] -recurse | Measure-Object -property length -sum | Select -expand sum)" } if ($compiler -eq 'MINGW') { diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 9de2becf81..fce4d8628e 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1844,7 +1844,8 @@ NOTE: These commands cannot be used with |:global| or |:vglobal|. ":endif", ":for" and ":endfor", ":while" and ":endwhile". *:start* *:startinsert* -:star[tinsert][!] Start Insert mode just after executing this command. +:star[tinsert][!] Start Insert mode (or |Terminal-mode| in a |terminal| + buffer) just after executing this command. Works like typing "i" in Normal mode. When the ! is included it works like "A", append to the line. Otherwise insertion starts at the cursor position. @@ -1854,8 +1855,8 @@ NOTE: These commands cannot be used with |:global| or |:vglobal|. This command does not work from |:normal|. *:stopi* *:stopinsert* -:stopi[nsert] Stop Insert mode as soon as possible. Works like - typing <Esc> in Insert mode. +:stopi[nsert] Stop Insert mode or |Terminal-mode| as soon as + possible. Works like typing <Esc> in Insert mode. Can be used in an autocommand, example: > :au BufEnter scratch stopinsert < diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c index 43beb684da..79b0df842f 100644 --- a/src/nvim/terminal.c +++ b/src/nvim/terminal.c @@ -403,6 +403,7 @@ void terminal_enter(void) redraw(false); s->state.execute = terminal_execute; + s->state.check = terminal_check; state_enter(&s->state); restart_edit = 0; @@ -427,6 +428,19 @@ void terminal_enter(void) } } +// Function executed before each iteration of terminal mode. +// Return: +// 1 if the iteration should continue normally +// 0 if the main loop must exit +static int terminal_check(VimState *state) +{ + if (stop_insert_mode) { + stop_insert_mode = false; + return 0; + } + return 1; +} + static int terminal_execute(VimState *state, int key) { TerminalState *s = (TerminalState *)state; diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua index dbee9bdb49..ca5737db7f 100644 --- a/test/functional/terminal/ex_terminal_spec.lua +++ b/test/functional/terminal/ex_terminal_spec.lua @@ -99,6 +99,13 @@ describe(':terminal', function() eq(3, #jumps) end) + it(':stopinsert RPC request exits terminal-mode #7807', function() + command(':terminal') + feed('i[tui] insert-mode') + eq({ blocking=false, mode='t' }, nvim('get_mode')) + command('stopinsert') + eq({ blocking=false, mode='n' }, nvim('get_mode')) + end) end) describe(':terminal (with fake shell)', function() |