feat(mappings): do not replace existing mapping for simplified form

1 files changed, 42 insertions, 15 deletions

diff --git a/test/functional/ui/input_spec.lua b/test/functional/ui/input_spec.lua
index 25fc9cdcd1..0f4e97088c 100644
--- a/test/functional/ui/input_spec.lua
+++ b/test/functional/ui/input_spec.lua
@@ -173,11 +173,20 @@ describe('input pairs', function()
       eq('\t\t', curbuf_contents())
     end)
 
-    it('can be mapped', function()
-      command('inoremap <tab> TAB!')
-      command('inoremap <c-i> CTRL-I!')
-      feed('i<tab><c-i><esc>')
-      eq('TAB!CTRL-I!', curbuf_contents())
+    describe('can be mapped separately', function()
+      it('if <tab> is mapped after <c-i>', function()
+        command('inoremap <c-i> CTRL-I!')
+        command('inoremap <tab> TAB!')
+        feed('i<tab><c-i><esc>')
+        eq('TAB!CTRL-I!', curbuf_contents())
+      end)
+
+      it('if <tab> is mapped before <c-i>', function()
+        command('inoremap <tab> TAB!')
+        command('inoremap <c-i> CTRL-I!')
+        feed('i<tab><c-i><esc>')
+        eq('TAB!CTRL-I!', curbuf_contents())
+      end)
     end)
   end)
 
@@ -187,11 +196,20 @@ describe('input pairs', function()
       eq('unos\ndos\ntres', curbuf_contents())
     end)
 
-    it('can be mapped', function()
-      command('inoremap <c-m> SNIPPET!')
-      command('inoremap <cr> , and then<cr>')
-      feed('iunos<c-m>dos<cr>tres<esc>')
-      eq('unosSNIPPET!dos, and then\ntres', curbuf_contents())
+    describe('can be mapped separately', function()
+      it('if <cr> is mapped after <c-m>', function()
+        command('inoremap <c-m> SNIPPET!')
+        command('inoremap <cr> , and then<cr>')
+        feed('iunos<c-m>dos<cr>tres<esc>')
+        eq('unosSNIPPET!dos, and then\ntres', curbuf_contents())
+      end)
+
+      it('if <cr> is mapped before <c-m>', function()
+        command('inoremap <cr> , and then<cr>')
+        command('inoremap <c-m> SNIPPET!')
+        feed('iunos<c-m>dos<cr>tres<esc>')
+        eq('unosSNIPPET!dos, and then\ntres', curbuf_contents())
+      end)
     end)
   end)
 
@@ -201,11 +219,20 @@ describe('input pairs', function()
       eq('doubledoublesingle', curbuf_contents())
     end)
 
-    it('can be mapped', function()
-      command('inoremap <c-[> HALLOJ!')
-      command('inoremap <esc> ,<esc>')
-      feed('2adubbel<c-[>upp<esc>')
-      eq('dubbelHALLOJ!upp,dubbelHALLOJ!upp,', curbuf_contents())
+    describe('can be mapped separately', function()
+      it('if <esc> is mapped after <c-[>', function()
+        command('inoremap <c-[> HALLOJ!')
+        command('inoremap <esc> ,<esc>')
+        feed('2adubbel<c-[>upp<esc>')
+        eq('dubbelHALLOJ!upp,dubbelHALLOJ!upp,', curbuf_contents())
+      end)
+
+      it('if <esc> is mapped before <c-[>', function()
+        command('inoremap <esc> ,<esc>')
+        command('inoremap <c-[> HALLOJ!')
+        feed('2adubbel<c-[>upp<esc>')
+        eq('dubbelHALLOJ!upp,dubbelHALLOJ!upp,', curbuf_contents())
+      end)
     end)
   end)
 end)