Merge pull request #4317 from justinmk/superkey

keymap: Support <D-...> (super/command key).

2 files changed, 21 insertions, 4 deletions

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index f4a9ddc698..9c9759adf6 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -144,15 +144,23 @@ describe('vim_* functions', function()
 
   describe('replace_termcodes', function()
     it('escapes K_SPECIAL as K_SPECIAL KS_SPECIAL KE_FILLER', function()
-      eq(helpers.nvim('replace_termcodes', '\128', true, true, true), '\128\254X')
+      eq('\128\254X', helpers.nvim('replace_termcodes', '\128', true, true, true))
     end)
 
-    it('leaves non K_SPECIAL string unchanged', function()
-      eq(helpers.nvim('replace_termcodes', 'abc', true, true, true), 'abc')
+    it('leaves non-K_SPECIAL string unchanged', function()
+      eq('abc', helpers.nvim('replace_termcodes', 'abc', true, true, true))
     end)
 
     it('converts <expressions>', function()
-      eq(helpers.nvim('replace_termcodes', '<Leader>', true, true, true), '\\')
+      eq('\\', helpers.nvim('replace_termcodes', '<Leader>', true, true, true))
+    end)
+
+    it('converts <LeftMouse> to K_SPECIAL KS_EXTRA KE_LEFTMOUSE', function()
+      -- K_SPECIAL KS_EXTRA KE_LEFTMOUSE
+      -- 0x80      0xfd     0x2c
+      -- 128       253      44
+      eq('\128\253\44', helpers.nvim('replace_termcodes',
+                                     '<LeftMouse>', true, true, true))
     end)
   end)
 
diff --git a/test/functional/ui/input_spec.lua b/test/functional/ui/input_spec.lua
index 4818830940..6f5cadaf81 100644
--- a/test/functional/ui/input_spec.lua
+++ b/test/functional/ui/input_spec.lua
@@ -25,6 +25,9 @@ describe('mappings', function()
     add_mapping('<s-up>', '<s-up>')
     add_mapping('<c-s-up>', '<c-s-up>')
     add_mapping('<c-s-a-up>', '<c-s-a-up>')
+    add_mapping('<c-s-a-d-up>', '<c-s-a-d-up>')
+    add_mapping('<c-d-a>', '<c-d-a>')
+    add_mapping('<d-1>', '<d-1>')
   end)
 
   it('ok', function()
@@ -37,6 +40,12 @@ describe('mappings', function()
     check_mapping('<s-a-c-up>', '<c-s-a-up>')
     check_mapping('<a-c-s-up>', '<c-s-a-up>')
     check_mapping('<a-s-c-up>', '<c-s-a-up>')
+    check_mapping('<c-s-a-d-up>', '<c-s-a-d-up>')
+    check_mapping('<s-a-d-c-up>', '<c-s-a-d-up>')
+    check_mapping('<d-s-a-c-up>', '<c-s-a-d-up>')
+    check_mapping('<c-d-a>', '<c-d-a>')
+    check_mapping('<d-c-a>', '<c-d-a>')
+    check_mapping('<d-1>', '<d-1>')
   end)
 end)