Merge pull request #18886 from neovim/backport-18885-to-release-0.7

[Backport release-0.7] fix(input): allow Ctrl-C to interrupt a recursive mapping even if mapped
neovim · Jun 7, 2022 · d317cb2 · d317cb2
2 parents f0f6350 + 1496f42
commit d317cb2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
@@ -2184,19 +2184,19 @@ static int vgetorpeek(bool advance)
       // try re-mapping.
       for (;;) {
         check_end_reg_executing(advance);
-        // os_breakcheck() can call input_enqueue()
-        if ((mapped_ctrl_c | curbuf->b_mapped_ctrl_c) & get_real_state()) {
-          ctrl_c_interrupts = false;
-        }
         // os_breakcheck() is slow, don't use it too often when
         // inside a mapping.  But call it each time for typed
         // characters.
         if (typebuf.tb_maplen) {
           line_breakcheck();
         } else {
+          // os_breakcheck() can call input_enqueue()
+          if ((mapped_ctrl_c | curbuf->b_mapped_ctrl_c) & get_real_state()) {
+            ctrl_c_interrupts = false;
+          }
           os_breakcheck();  // check for CTRL-C
+          ctrl_c_interrupts = true;
         }
-        ctrl_c_interrupts = true;
         int keylen = 0;
         if (got_int) {
           // flush all input

diff --git a/test/functional/ex_cmds/ctrl_c_spec.lua → test/functional/editor/ctrl_c_spec.lua b/test/functional/ex_cmds/ctrl_c_spec.lua → test/functional/editor/ctrl_c_spec.lua
@@ -72,4 +72,23 @@ describe("CTRL-C (mapped)", function()
       -- INSERT --                                        |
     ]])
   end)
+
+  it('interrupts recursive mapping', function()
+    command('nnoremap <C-C> <Nop>')
+    command('nmap <F2> <Ignore><F2>')
+    feed('<F2>')
+    sleep(10)
+    feed('foo<C-C>')
+    -- wait for input buffer to be flushed
+    sleep(10)
+    feed('i')
+    screen:expect([[
+      ^                                                    |
+      ~                                                   |
+      ~                                                   |
+      ~                                                   |
+      ~                                                   |
+      -- INSERT --                                        |
+    ]])
+  end)
 end)