Merge pull request #9926 from glacambre/fix_9889

bfredl · web-flow · commit 3f712185058f · 2019-04-20T10:46:20.000+02:00
Fix #9889: stopinsert prohibiting terminal mode
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
@@ -374,6 +374,7 @@ void terminal_enter(void)
   TerminalState state, *s = &state;
   memset(s, 0, sizeof(TerminalState));
   s->term = buf->terminal;
+  stop_insert_mode = false;
 
   // Ensure the terminal is properly sized. Ideally window size management
   // code should always have resized the terminal already, but check here to
@@ -435,7 +436,6 @@ void terminal_enter(void)
 static int terminal_check(VimState *state)
 {
   if (stop_insert_mode) {
-    stop_insert_mode = false;
     return 0;
   }
   return 1;
diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua
@@ -106,6 +106,15 @@ describe(':terminal', function()
     command('stopinsert')
     eq({ blocking=false, mode='n' }, nvim('get_mode'))
   end)
+
+  it(':stopinsert in normal mode doesn\'t break insert mode #9889', function()
+    command(':terminal')
+    eq({ blocking=false, mode='n' }, nvim('get_mode'))
+    command(':stopinsert')
+    eq({ blocking=false, mode='n' }, nvim('get_mode'))
+    feed('a')
+    eq({ blocking=false, mode='t' }, nvim('get_mode'))
+  end)
 end)
 
 describe(':terminal (with fake shell)', function()

Original file line number	Diff line number	Diff line change
`@@ -374,6 +374,7 @@ void terminal_enter(void)`
`374`	`374`	`TerminalState state, *s = &state;`
`375`	`375`	`memset(s, 0, sizeof(TerminalState));`
`376`	`376`	`s->term = buf->terminal;`
	`377`	`+ stop_insert_mode = false;`
`377`	`378`
`378`	`379`	`// Ensure the terminal is properly sized. Ideally window size management`
`379`	`380`	`// code should always have resized the terminal already, but check here to`
`@@ -435,7 +436,6 @@ void terminal_enter(void)`
`435`	`436`	`static int terminal_check(VimState *state)`
`436`	`437`	`{`
`437`	`438`	`if (stop_insert_mode) {`
`438`		`- stop_insert_mode = false;`
`439`	`439`	`return 0;`
`440`	`440`	`}`
`441`	`441`	`return 1;`