Merge branch 'master' into expression-parser

4 files changed, 596 insertions, 4 deletions

diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua
index e1e11203e0..2143c01139 100644
--- a/test/functional/ui/bufhl_spec.lua
+++ b/test/functional/ui/bufhl_spec.lua
@@ -24,7 +24,8 @@ describe('Buffer highlighting', function()
       [6] = {foreground = Screen.colors.DarkCyan}, -- Identifier
       [7] = {bold = true},
       [8] = {underline = true, bold = true, foreground = Screen.colors.SlateBlue},
-      [9] = {foreground = Screen.colors.SlateBlue, underline = true}
+      [9] = {foreground = Screen.colors.SlateBlue, underline = true},
+      [10] = {foreground = Screen.colors.Red}
     })
     curbuf = request('nvim_get_current_buf')
   end)
@@ -255,4 +256,32 @@ describe('Buffer highlighting', function()
                                               |
     ]])
   end)
+
+  it('works with new syntax groups', function()
+    insert([[
+      fancy code in a new fancy language]])
+    add_hl(-1, "FancyLangItem", 0, 0, 5)
+    screen:expect([[
+      fancy code in a new fancy languag^e      |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+                                              |
+    ]])
+
+    command('hi FancyLangItem guifg=red')
+    screen:expect([[
+      {10:fancy} code in a new fancy languag^e      |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+                                              |
+    ]])
+  end)
 end)
diff --git a/test/functional/ui/cmdline_spec.lua b/test/functional/ui/cmdline_spec.lua
new file mode 100644
index 0000000000..0f8302b036
--- /dev/null
+++ b/test/functional/ui/cmdline_spec.lua
@@ -0,0 +1,525 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local clear, feed, eq = helpers.clear, helpers.feed, helpers.eq
+local source = helpers.source
+local ok = helpers.ok
+local command = helpers.command
+
+describe('external cmdline', function()
+  local screen
+  local last_level = 0
+  local cmdline = {}
+  local block = nil
+
+  before_each(function()
+    clear()
+    cmdline, block = {}, nil
+    screen = Screen.new(25, 5)
+    screen:attach({rgb=true, ext_cmdline=true})
+    screen:set_on_event_handler(function(name, data)
+      if name == "cmdline_show" then
+        local content, pos, firstc, prompt, indent, level = unpack(data)
+        ok(level > 0)
+        cmdline[level] = {content=content, pos=pos, firstc=firstc,
+                          prompt=prompt, indent=indent}
+        last_level = level
+      elseif name == "cmdline_hide" then
+        local level = data[1]
+        cmdline[level] = nil
+      elseif name == "cmdline_special_char" then
+        local char, shift, level = unpack(data)
+        cmdline[level].special = {char, shift}
+      elseif name == "cmdline_pos" then
+        local pos, level = unpack(data)
+        cmdline[level].pos = pos
+      elseif name == "cmdline_block_show" then
+        block = data[1]
+      elseif name == "cmdline_block_append" then
+        block[#block+1] = data[1]
+      elseif name == "cmdline_block_hide" then
+        block = nil
+      end
+    end)
+  end)
+
+  after_each(function()
+    screen:detach()
+  end)
+
+  local function expect_cmdline(level, expected)
+    local attr_ids = screen._default_attr_ids
+    local attr_ignore = screen._default_attr_ignore
+    local actual = ''
+    for _, chunk in ipairs(cmdline[level] and cmdline[level].content or {}) do
+      local attrs, text = chunk[1], chunk[2]
+      if screen:_equal_attrs(attrs, {}) then
+        actual = actual..text
+      else
+        local attr_id = screen:_get_attr_id(attr_ids, attr_ignore, attrs)
+        actual =  actual..'{' .. attr_id .. ':' .. text .. '}'
+      end
+    end
+    eq(expected, actual)
+  end
+
+  it('works', function()
+    feed(':')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq(1, last_level)
+      eq({{
+        content = { { {}, "" } },
+        firstc = ":",
+        indent = 0,
+        pos = 0,
+        prompt = ""
+      }}, cmdline)
+    end)
+
+    feed('sign')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "sign" } },
+        firstc = ":",
+        indent = 0,
+        pos = 4,
+        prompt = ""
+      }}, cmdline)
+    end)
+
+    feed('<Left>')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "sign" } },
+        firstc = ":",
+        indent = 0,
+        pos = 3,
+        prompt = ""
+      }}, cmdline)
+    end)
+
+    feed('<bs>')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "sin" } },
+        firstc = ":",
+        indent = 0,
+        pos = 2,
+        prompt = ""
+      }}, cmdline)
+    end)
+
+    feed('<Esc>')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({}, cmdline)
+    end)
+  end)
+
+  it("works with input()", function()
+    feed(':call input("input", "default")<cr>')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "default" } },
+        firstc = "",
+        indent = 0,
+        pos = 7,
+        prompt = "input"
+      }}, cmdline)
+    end)
+    feed('<cr>')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({}, cmdline)
+    end)
+
+  end)
+
+  it("works with special chars and nested cmdline", function()
+    feed(':xx<c-r>')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "xx" } },
+        firstc = ":",
+        indent = 0,
+        pos = 2,
+        prompt = "",
+        special = {'"', true},
+      }}, cmdline)
+    end)
+
+    feed('=')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "xx" } },
+        firstc = ":",
+        indent = 0,
+        pos = 2,
+        prompt = "",
+        special = {'"', true},
+      },{
+        content = { { {}, "" } },
+        firstc = "=",
+        indent = 0,
+        pos = 0,
+        prompt = "",
+      }}, cmdline)
+    end)
+
+    feed('1+2')
+    local expectation = {{
+        content = { { {}, "xx" } },
+        firstc = ":",
+        indent = 0,
+        pos = 2,
+        prompt = "",
+        special = {'"', true},
+      },{
+        content = { { {}, "1+2" } },
+        firstc = "=",
+        indent = 0,
+        pos = 3,
+        prompt = "",
+      }}
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq(expectation, cmdline)
+    end)
+
+    -- erase information, so we check if it is retransmitted
+    cmdline = {}
+    command("redraw!")
+    -- redraw! forgets cursor position. Be OK with that, as UI should indicate
+    -- focus is at external cmdline anyway.
+    screen:expect([[
+                               |
+      ~                        |
+      ~                        |
+      ~                        |
+      ^                         |
+    ]], nil, nil, function()
+      eq(expectation, cmdline)
+    end)
+
+
+    feed('<cr>')
+    screen:expect([[
+                               |
+      ~                        |
+      ~                        |
+      ~                        |
+      ^                         |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "xx3" } },
+        firstc = ":",
+        indent = 0,
+        pos = 3,
+        prompt = "",
+      }}, cmdline)
+    end)
+
+    feed('<esc>')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({}, cmdline)
+    end)
+  end)
+
+  it("works with function definitions", function()
+    feed(':function Foo()<cr>')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "" } },
+        firstc = ":",
+        indent = 2,
+        pos = 0,
+        prompt = "",
+      }}, cmdline)
+      eq({{{{}, 'function Foo()'}}}, block)
+    end)
+
+    feed('line1<cr>')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({{{{}, 'function Foo()'}},
+          {{{}, '  line1'}}}, block)
+    end)
+
+    block = {}
+    command("redraw!")
+    screen:expect([[
+                               |
+      ~                        |
+      ~                        |
+      ~                        |
+      ^                         |
+    ]], nil, nil, function()
+      eq({{{{}, 'function Foo()'}},
+          {{{}, '  line1'}}}, block)
+    end)
+
+
+    feed('endfunction<cr>')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq(nil, block)
+    end)
+  end)
+
+  it("works with cmdline window", function()
+    feed(':make')
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "make" } },
+        firstc = ":",
+        indent = 0,
+        pos = 4,
+        prompt = ""
+      }}, cmdline)
+    end)
+
+    feed('<c-f>')
+    screen:expect([[
+                               |
+      [No Name]                |
+      :make^                    |
+      [Command Line]           |
+                               |
+    ]], nil, nil, function()
+      eq({}, cmdline)
+    end)
+
+    -- nested cmdline
+    feed(':yank')
+    screen:expect([[
+                               |
+      [No Name]                |
+      :make^                    |
+      [Command Line]           |
+                               |
+    ]], nil, nil, function()
+      eq({nil, {
+        content = { { {}, "yank" } },
+        firstc = ":",
+        indent = 0,
+        pos = 4,
+        prompt = ""
+      }}, cmdline)
+    end)
+
+    cmdline = {}
+    command("redraw!")
+    screen:expect([[
+                               |
+      [No Name]                |
+      :make                    |
+      [Command Line]           |
+      ^                         |
+    ]], nil, nil, function()
+      eq({nil, {
+        content = { { {}, "yank" } },
+        firstc = ":",
+        indent = 0,
+        pos = 4,
+        prompt = ""
+      }}, cmdline)
+    end)
+
+    feed("<c-c>")
+    screen:expect([[
+                               |
+      [No Name]                |
+      :make^                    |
+      [Command Line]           |
+                               |
+    ]], nil, nil, function()
+      eq({}, cmdline)
+    end)
+
+    feed("<c-c>")
+    screen:expect([[
+                               |
+      [No Name]                |
+      :make^                    |
+      [Command Line]           |
+                               |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "make" } },
+        firstc = ":",
+        indent = 0,
+        pos = 4,
+        prompt = ""
+      }}, cmdline)
+    end)
+
+    cmdline = {}
+    command("redraw!")
+    screen:expect([[
+                               |
+      ~                        |
+      ~                        |
+      ~                        |
+      ^                         |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "make" } },
+        firstc = ":",
+        indent = 0,
+        pos = 4,
+        prompt = ""
+      }}, cmdline)
+    end)
+  end)
+
+  it('works with inputsecret()', function()
+    feed(":call inputsecret('secret:')<cr>abc123")
+    screen:expect([[
+      ^                         |
+      ~                        |
+      ~                        |
+      ~                        |
+                               |
+    ]], nil, nil, function()
+      eq({{
+        content = { { {}, "******" } },
+        firstc = "",
+        indent = 0,
+        pos = 6,
+        prompt = "secret:"
+      }}, cmdline)
+    end)
+  end)
+
+  it('works with highlighted cmdline', function()
+      source([[
+        highlight RBP1 guibg=Red
+        highlight RBP2 guibg=Yellow
+        highlight RBP3 guibg=Green
+        highlight RBP4 guibg=Blue
+        let g:NUM_LVLS = 4
+        function RainBowParens(cmdline)
+          let ret = []
+          let i = 0
+          let lvl = 0
+          while i < len(a:cmdline)
+            if a:cmdline[i] is# '('
+              call add(ret, [i, i + 1, 'RBP' . ((lvl % g:NUM_LVLS) + 1)])
+              let lvl += 1
+            elseif a:cmdline[i] is# ')'
+              let lvl -= 1
+              call add(ret, [i, i + 1, 'RBP' . ((lvl % g:NUM_LVLS) + 1)])
+            endif
+            let i += 1
+          endwhile
+          return ret
+        endfunction
+        map <f5>  :let x = input({'prompt':'>','highlight':'RainBowParens'})<cr>
+        "map <f5>  :let x = input({'prompt':'>'})<cr>
+      ]])
+      screen:set_default_attr_ids({
+        RBP1={background = Screen.colors.Red},
+        RBP2={background = Screen.colors.Yellow},
+        RBP3={background = Screen.colors.Green},
+        RBP4={background = Screen.colors.Blue},
+        EOB={bold = true, foreground = Screen.colors.Blue1},
+        ERR={foreground = Screen.colors.Grey100, background = Screen.colors.Red},
+        SK={foreground = Screen.colors.Blue},
+        PE={bold = true, foreground = Screen.colors.SeaGreen4}
+      })
+      feed('<f5>(a(b)a)')
+      screen:expect([[
+        ^                         |
+        {EOB:~                        }|
+        {EOB:~                        }|
+        {EOB:~                        }|
+                                 |
+      ]], nil, nil, function()
+        expect_cmdline(1, '{RBP1:(}a{RBP2:(}b{RBP2:)}a{RBP1:)}')
+      end)
+  end)
+end)
diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua
index 077b0ec14c..d1357ea525 100644
--- a/test/functional/ui/highlight_spec.lua
+++ b/test/functional/ui/highlight_spec.lua
@@ -518,7 +518,7 @@ describe("'listchars' highlight", function()
     ]])
     feed_command('set cursorline')
     screen:expect([[
-      {2:^>-------.}{1:abcd}{2:.}{1:Lorem}{3:>}|
+      {2:^>-------.}{1:abcd}{2:.}{1:Lorem}{4:>}|
       {5:>-------.}abcd{5:*}{4:¬}     |
       {4:¬}                   |
       {4:~                   }|
@@ -526,7 +526,7 @@ describe("'listchars' highlight", function()
     ]])
     feed('$')
     screen:expect([[
-      {3:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1:        }|
+      {4:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1:        }|
       {4:<}                   |
       {4:<}                   |
       {4:~                   }|
@@ -607,7 +607,7 @@ describe("'listchars' highlight", function()
     feed('<esc>$')
     screen:expect([[
       {4:<}                   |
-      {3:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1:        }|
+      {4:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1:        }|
       {4:<}                   |
       {4:~                   }|
                           |
diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua
index c8fa2888d1..cc023ef10d 100644
--- a/test/functional/ui/inccommand_spec.lua
+++ b/test/functional/ui/inccommand_spec.lua
@@ -701,6 +701,25 @@ describe(":substitute, inccommand=split", function()
     eq(0, eval("&modified"))
   end)
 
+  it("shows preview when cmd modifiers are present", function()
+    -- one modifier
+    feed(':keeppatterns %s/tw/to')
+    screen:expect([[too lines]], nil, nil, nil, true)
+    feed('<Esc>')
+    screen:expect([[two lines]], nil, nil, nil, true)
+
+    -- multiple modifiers
+    feed(':keeppatterns silent %s/tw/to')
+    screen:expect([[too lines]], nil, nil, nil, true)
+    feed('<Esc>')
+    screen:expect([[two lines]], nil, nil, nil, true)
+
+    -- non-modifier prefix
+    feed(':silent tabedit %s/tw/to')
+    screen:expect([[two lines]], nil, nil, nil, true)
+    feed('<Esc>')
+  end)
+
   it('shows split window when typing the pattern', function()
     feed(":%s/tw")
     screen:expect([[
@@ -1140,6 +1159,25 @@ describe("inccommand=nosplit", function()
     ]])
   end)
 
+  it("shows preview when cmd modifiers are present", function()
+    -- one modifier
+    feed(':keeppatterns %s/tw/to')
+    screen:expect([[too lines]], nil, nil, nil, true)
+    feed('<Esc>')
+    screen:expect([[two lines]], nil, nil, nil, true)
+
+    -- multiple modifiers
+    feed(':keeppatterns silent %s/tw/to')
+    screen:expect([[too lines]], nil, nil, nil, true)
+    feed('<Esc>')
+    screen:expect([[two lines]], nil, nil, nil, true)
+
+    -- non-modifier prefix
+    feed(':silent tabedit %s/tw/to')
+    screen:expect([[two lines]], nil, nil, nil, true)
+    feed('<Esc>')
+  end)
+
   it('never shows preview buffer', function()
     feed_command("set hlsearch")