Merge branch 'master' into s-dash-stdin

3 files changed, 183 insertions, 45 deletions

diff --git a/test/functional/options/autochdir_spec.lua b/test/functional/options/autochdir_spec.lua
index 209531515c..2fce0a5ed9 100644
--- a/test/functional/options/autochdir_spec.lua
+++ b/test/functional/options/autochdir_spec.lua
@@ -3,8 +3,6 @@ local clear = helpers.clear
 local eq = helpers.eq
 local getcwd = helpers.funcs.getcwd
 
-if helpers.pending_win32(pending) then return end
-
 describe("'autochdir'", function()
   it('given on the shell gets processed properly', function()
     local targetdir = 'test/functional/fixtures'
@@ -12,9 +10,10 @@ describe("'autochdir'", function()
     -- By default 'autochdir' is off, thus getcwd() returns the repo root.
     clear(targetdir..'/tty-test.c')
     local rootdir = getcwd()
+    local expected = rootdir .. '/' .. targetdir
 
     -- With 'autochdir' on, we should get the directory of tty-test.c.
     clear('--cmd', 'set autochdir', targetdir..'/tty-test.c')
-    eq(rootdir..'/'..targetdir, getcwd())
+    eq(helpers.iswin() and expected:gsub('/', '\\') or expected, getcwd())
   end)
 end)
diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua
index b83b7b8eee..9e29baba2d 100644
--- a/test/functional/options/defaults_spec.lua
+++ b/test/functional/options/defaults_spec.lua
@@ -7,23 +7,13 @@ local command = helpers.command
 local clear = helpers.clear
 local eval = helpers.eval
 local eq = helpers.eq
+local insert = helpers.insert
 local neq = helpers.neq
 local mkdir = helpers.mkdir
 local rmdir = helpers.rmdir
 
-local function init_session(...)
-  local args = { helpers.nvim_prog, '-i', 'NONE', '--embed',
-                 '--cmd', helpers.nvim_set }
-  for _, v in ipairs({...}) do
-    table.insert(args, v)
-  end
-  helpers.set_session(helpers.spawn(args))
-end
-
 describe('startup defaults', function()
   describe(':filetype', function()
-    if helpers.pending_win32(pending) then return end
-
     local function expect_filetype(expected)
       local screen = Screen.new(50, 4)
       screen:attach()
@@ -36,50 +26,70 @@ describe('startup defaults', function()
       )
     end
 
-    it('enabled by `-u NORC`', function()
-      init_session('-u', 'NORC')
+    it('all ON after `-u NORC`', function()
+      clear('-u', 'NORC')
       expect_filetype(
         'filetype detection:ON  plugin:ON  indent:ON       |')
     end)
 
-    it('disabled by `-u NONE`', function()
-      init_session('-u', 'NONE')
+    it('all ON after `:syntax …` #7765', function()
+      clear('-u', 'NORC', '--cmd', 'syntax on')
       expect_filetype(
-        'filetype detection:OFF  plugin:OFF  indent:OFF    |')
+        'filetype detection:ON  plugin:ON  indent:ON       |')
+      clear('-u', 'NORC', '--cmd', 'syntax off')
+      expect_filetype(
+        'filetype detection:ON  plugin:ON  indent:ON       |')
     end)
 
-    it('overridden by early `filetype on`', function()
-      init_session('-u', 'NORC', '--cmd', 'filetype on')
+    it('all OFF after `-u NONE`', function()
+      clear('-u', 'NONE')
       expect_filetype(
-        'filetype detection:ON  plugin:OFF  indent:OFF     |')
+        'filetype detection:OFF  plugin:OFF  indent:OFF    |')
     end)
 
-    it('overridden by early `filetype plugin on`', function()
-      init_session('-u', 'NORC', '--cmd', 'filetype plugin on')
+    it('explicit OFF stays OFF', function()
+      clear('-u', 'NORC', '--cmd',
+            'syntax off | filetype off | filetype plugin indent off')
+      expect_filetype(
+        'filetype detection:OFF  plugin:OFF  indent:OFF    |')
+      clear('-u', 'NORC', '--cmd', 'syntax off | filetype plugin indent off')
+      expect_filetype(
+        'filetype detection:ON  plugin:OFF  indent:OFF     |')
+      clear('-u', 'NORC', '--cmd', 'filetype indent off')
       expect_filetype(
         'filetype detection:ON  plugin:ON  indent:OFF      |')
+      clear('-u', 'NORC', '--cmd', 'syntax off | filetype off')
+      expect_filetype(
+        'filetype detection:OFF  plugin:(on)  indent:(on)  |')
+      -- Swap the order.
+      clear('-u', 'NORC', '--cmd', 'filetype off | syntax off')
+      expect_filetype(
+        'filetype detection:OFF  plugin:(on)  indent:(on)  |')
     end)
 
-    it('overridden by early `filetype indent on`', function()
-      init_session('-u', 'NORC', '--cmd', 'filetype indent on')
+    it('all ON after early `:filetype … on`', function()
+      -- `:filetype … on` should not change the defaults. #7765
+      -- Only an explicit `:filetype … off` sets OFF.
+
+      clear('-u', 'NORC', '--cmd', 'filetype on')
       expect_filetype(
-        'filetype detection:ON  plugin:OFF  indent:ON      |')
+        'filetype detection:ON  plugin:ON  indent:ON       |')
+      clear('-u', 'NORC', '--cmd', 'filetype plugin on')
+      expect_filetype(
+        'filetype detection:ON  plugin:ON  indent:ON       |')
+      clear('-u', 'NORC', '--cmd', 'filetype indent on')
+      expect_filetype(
+        'filetype detection:ON  plugin:ON  indent:ON       |')
     end)
 
-    it('adjusted by late `filetype off`', function()
-      init_session('-u', 'NORC', '-c', 'filetype off')
+    it('late `:filetype … off` stays OFF', function()
+      clear('-u', 'NORC', '-c', 'filetype off')
       expect_filetype(
         'filetype detection:OFF  plugin:(on)  indent:(on)  |')
-    end)
-
-    it('adjusted by late `filetype plugin off`', function()
-      init_session('-u', 'NORC', '-c', 'filetype plugin off')
+      clear('-u', 'NORC', '-c', 'filetype plugin off')
       expect_filetype(
         'filetype detection:ON  plugin:OFF  indent:ON      |')
-    end)
-
-    it('adjusted by late `filetype indent off`', function()
-      init_session('-u', 'NORC', '-c', 'filetype indent off')
+      clear('-u', 'NORC', '-c', 'filetype indent off')
       expect_filetype(
         'filetype detection:ON  plugin:ON  indent:OFF      |')
     end)
@@ -87,27 +97,59 @@ describe('startup defaults', function()
 
   describe('syntax', function()
     it('enabled by `-u NORC`', function()
-      init_session('-u', 'NORC')
+      clear('-u', 'NORC')
       eq(1, eval('g:syntax_on'))
     end)
 
     it('disabled by `-u NONE`', function()
-      init_session('-u', 'NONE')
+      clear('-u', 'NONE')
       eq(0, eval('exists("g:syntax_on")'))
     end)
 
-    it('overridden by early `syntax off`', function()
-      init_session('-u', 'NORC', '--cmd', 'syntax off')
+    it('`:syntax off` stays off', function()
+      -- early
+      clear('-u', 'NORC', '--cmd', 'syntax off')
+      eq(0, eval('exists("g:syntax_on")'))
+      -- late
+      clear('-u', 'NORC', '-c', 'syntax off')
       eq(0, eval('exists("g:syntax_on")'))
     end)
+  end)
 
-    it('adjusted by late `syntax off`', function()
-      init_session('-u', 'NORC', '-c', 'syntax off')
-      eq(0, eval('exists("g:syntax_on")'))
+  describe("'fillchars'", function()
+    it('vert/fold flags', function()
+      clear()
+      local screen = Screen.new(50, 5)
+      screen:attach()
+      command('set laststatus=0')
+      insert([[
+        1
+        2
+        3
+        4]])
+      command('normal! ggjzfj')
+      command('vsp')
+      screen:expect([[
+        1                        │1                       |
+        ^+--  2 lines: 2··········│+--  2 lines: 2·········|
+        4                        │4                       |
+        ~                        │~                       |
+                                                          |
+      ]])
+
+      -- ambiwidth=double defaults to single-byte fillchars.
+      command('set ambiwidth=double')
+      screen:expect([[
+        1                        |1                       |
+        ^+--  2 lines: 2----------|+--  2 lines: 2---------|
+        4                        |4                       |
+        ~                        |~                       |
+                                                          |
+      ]])
     end)
   end)
 
-  describe('packpath', function()
+  describe("'packpath'", function()
     it('defaults to &runtimepath', function()
       eq(meths.get_option('runtimepath'), meths.get_option('packpath'))
     end)
diff --git a/test/functional/options/num_options_spec.lua b/test/functional/options/num_options_spec.lua
new file mode 100644
index 0000000000..ed17ffdd3c
--- /dev/null
+++ b/test/functional/options/num_options_spec.lua
@@ -0,0 +1,97 @@
+-- Tests for :setlocal and :setglobal
+
+local helpers = require('test.functional.helpers')(after_each)
+local clear, feed_command, eval, eq, meths =
+  helpers.clear, helpers.feed_command, helpers.eval, helpers.eq, helpers.meths
+
+local function should_fail(opt, value, errmsg)
+  feed_command('setglobal ' .. opt .. '=' .. value)
+  eq(errmsg, eval("v:errmsg"):match("E%d*"))
+  feed_command('let v:errmsg = ""')
+  feed_command('setlocal ' .. opt .. '=' .. value)
+  eq(errmsg, eval("v:errmsg"):match("E%d*"))
+  feed_command('let v:errmsg = ""')
+  local status, err = pcall(meths.set_option, opt, value)
+  eq(status, false)
+  eq(errmsg, err:match("E%d*"))
+  eq('', eval("v:errmsg"))
+end
+
+local function should_succeed(opt, value)
+  feed_command('setglobal ' .. opt .. '=' .. value)
+  feed_command('setlocal ' .. opt .. '=' .. value)
+  meths.set_option(opt, value)
+  eq(value, meths.get_option(opt))
+  eq('', eval("v:errmsg"))
+end
+
+describe(':setlocal', function()
+  before_each(clear)
+
+  it('setlocal sets only local value', function()
+    eq(0, meths.get_option('iminsert'))
+    feed_command('setlocal iminsert=1')
+    eq(0, meths.get_option('iminsert'))
+    eq(0, meths.get_option('imsearch'))
+    feed_command('setlocal imsearch=1')
+    eq(0, meths.get_option('imsearch'))
+  end)
+end)
+
+describe(':set validation', function()
+  before_each(clear)
+
+  it('setlocal and setglobal validate values', function()
+    should_fail('shiftwidth', -10, 'E487')
+    should_succeed('shiftwidth', 0)
+    should_fail('tabstop', -10, 'E487')
+    should_fail('winheight', -10, 'E487')
+    should_fail('winheight', 0, 'E487')
+    should_fail('winminheight', -1, 'E487')
+    should_succeed('winminheight', 0)
+    should_fail('winwidth', 0, 'E487')
+    should_fail('helpheight', -1, 'E487')
+    should_fail('maxcombine', 7, 'E474')
+    should_fail('iminsert', 3, 'E474')
+    should_fail('imsearch', 3, 'E474')
+    should_fail('titlelen', -1, 'E487')
+    should_fail('cmdheight', 0, 'E487')
+    should_fail('updatecount', -1, 'E487')
+    should_fail('textwidth', -1, 'E487')
+    should_fail('tabstop', 0, 'E487')
+    should_fail('timeoutlen', -1, 'E487')
+    should_fail('history', 1000000, 'E474')
+    should_fail('regexpengine', -1, 'E474')
+    should_fail('regexpengine', 3, 'E474')
+    should_succeed('regexpengine', 2)
+    should_fail('report', -1, 'E487')
+    should_succeed('report', 0)
+    should_fail('scrolloff', -1, 'E49')
+    should_fail('sidescrolloff', -1, 'E487')
+    should_fail('sidescroll', -1, 'E487')
+    should_fail('cmdwinheight', 0, 'E487')
+    should_fail('updatetime', -1, 'E487')
+
+    should_fail('foldlevel', -5, 'E487')
+    should_fail('foldcolumn', 13, 'E474')
+    should_fail('conceallevel', 4, 'E474')
+    should_fail('numberwidth', 11, 'E474')
+    should_fail('numberwidth', 0, 'E487')
+
+    -- If smaller than 1 this one is set to 'lines'-1
+    feed_command('setglobal window=-10')
+    meths.set_option('window', -10)
+    eq(23, meths.get_option('window'))
+    eq('', eval("v:errmsg"))
+  end)
+
+  it('set wmh/wh wmw/wiw checks', function()
+    feed_command('set winheight=2')
+    feed_command('set winminheight=3')
+    eq('E591', eval("v:errmsg"):match("E%d*"))
+
+    feed_command('set winwidth=2')
+    feed_command('set winminwidth=3')
+    eq('E592', eval("v:errmsg"):match("E%d*"))
+  end)
+end)