Merge branch 'master' into option-fixes

2 files changed, 103 insertions, 25 deletions

diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua
index f43d8eeafa..b83b7b8eee 100644
--- a/test/functional/options/defaults_spec.lua
+++ b/test/functional/options/defaults_spec.lua
@@ -8,6 +8,8 @@ local clear = helpers.clear
 local eval = helpers.eval
 local eq = helpers.eq
 local neq = helpers.neq
+local mkdir = helpers.mkdir
+local rmdir = helpers.rmdir
 
 local function init_session(...)
   local args = { helpers.nvim_prog, '-i', 'NONE', '--embed',
@@ -23,13 +25,13 @@ describe('startup defaults', function()
     if helpers.pending_win32(pending) then return end
 
     local function expect_filetype(expected)
-      local screen = Screen.new(48, 4)
+      local screen = Screen.new(50, 4)
       screen:attach()
       command('filetype')
       screen:expect([[
-        ^                                                |
-        ~                                               |
-        ~                                               |
+        ^                                                  |
+        ~                                                 |
+        ~                                                 |
         ]]..expected
       )
     end
@@ -37,31 +39,49 @@ describe('startup defaults', function()
     it('enabled by `-u NORC`', function()
       init_session('-u', 'NORC')
       expect_filetype(
-        'filetype detection:ON  plugin:ON  indent:ON     |')
+        'filetype detection:ON  plugin:ON  indent:ON       |')
     end)
 
     it('disabled by `-u NONE`', function()
       init_session('-u', 'NONE')
       expect_filetype(
-        'filetype detection:OFF  plugin:OFF  indent:OFF  |')
+        'filetype detection:OFF  plugin:OFF  indent:OFF    |')
     end)
 
     it('overridden by early `filetype on`', function()
       init_session('-u', 'NORC', '--cmd', 'filetype on')
       expect_filetype(
-        'filetype detection:ON  plugin:OFF  indent:OFF   |')
+        'filetype detection:ON  plugin:OFF  indent:OFF     |')
     end)
 
     it('overridden by early `filetype plugin on`', function()
       init_session('-u', 'NORC', '--cmd', 'filetype plugin on')
       expect_filetype(
-        'filetype detection:ON  plugin:ON  indent:OFF    |')
+        'filetype detection:ON  plugin:ON  indent:OFF      |')
     end)
 
     it('overridden by early `filetype indent on`', function()
       init_session('-u', 'NORC', '--cmd', 'filetype indent on')
       expect_filetype(
-        'filetype detection:ON  plugin:OFF  indent:ON    |')
+        'filetype detection:ON  plugin:OFF  indent:ON      |')
+    end)
+
+    it('adjusted by late `filetype off`', function()
+      init_session('-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')
+      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')
+      expect_filetype(
+        'filetype detection:ON  plugin:ON  indent:OFF      |')
     end)
   end)
 
@@ -80,6 +100,11 @@ describe('startup defaults', function()
       init_session('-u', 'NORC', '--cmd', 'syntax off')
       eq(0, eval('exists("g:syntax_on")'))
     end)
+
+    it('adjusted by late `syntax off`', function()
+      init_session('-u', 'NORC', '-c', 'syntax off')
+      eq(0, eval('exists("g:syntax_on")'))
+    end)
   end)
 
   describe('packpath', function()
@@ -98,6 +123,56 @@ describe('startup defaults', function()
   it('v:progpath is set to the absolute path', function()
     eq(eval("fnamemodify(v:progpath, ':p')"), eval('v:progpath'))
   end)
+
+  describe('$NVIM_LOG_FILE', function()
+    -- TODO(jkeyes): use stdpath('data') instead.
+    local datasubdir = helpers.iswin() and 'nvim-data' or 'nvim'
+    local xdgdir = 'Xtest-startup-xdg-logpath'
+    local xdgdatadir = xdgdir..'/'..datasubdir
+    after_each(function()
+      os.remove('Xtest-logpath')
+      rmdir(xdgdir)
+    end)
+
+    it('is used if expansion succeeds', function()
+      clear({env={
+        NVIM_LOG_FILE='Xtest-logpath',
+      }})
+      eq('Xtest-logpath', eval('$NVIM_LOG_FILE'))
+    end)
+    it('defaults to stdpath("data")/log if empty', function()
+      eq(true, mkdir(xdgdir) and mkdir(xdgdatadir))
+      clear({env={
+        XDG_DATA_HOME=xdgdir,
+        NVIM_LOG_FILE='',  -- Empty is invalid.
+      }})
+      -- server_start() calls ELOG, which tickles log_path_init().
+      pcall(command, 'call serverstart(serverlist()[0])')
+
+      eq(xdgdir..'/'..datasubdir..'/log', string.gsub(eval('$NVIM_LOG_FILE'), '\\', '/'))
+    end)
+    it('defaults to stdpath("data")/log if invalid', function()
+      eq(true, mkdir(xdgdir) and mkdir(xdgdatadir))
+      clear({env={
+        XDG_DATA_HOME=xdgdir,
+        NVIM_LOG_FILE='.',  -- Any directory is invalid.
+      }})
+      -- server_start() calls ELOG, which tickles log_path_init().
+      pcall(command, 'call serverstart(serverlist()[0])')
+
+      eq(xdgdir..'/'..datasubdir..'/log', string.gsub(eval('$NVIM_LOG_FILE'), '\\', '/'))
+    end)
+    it('defaults to .nvimlog if stdpath("data") is invalid', function()
+      clear({env={
+        XDG_DATA_HOME='Xtest-missing-xdg-dir',
+        NVIM_LOG_FILE='.',  -- Any directory is invalid.
+      }})
+      -- server_start() calls ELOG, which tickles log_path_init().
+      pcall(command, 'call serverstart(serverlist()[0])')
+
+      eq('.nvimlog', eval('$NVIM_LOG_FILE'))
+    end)
+  end)
 end)
 
 describe('XDG-based defaults', function()
diff --git a/test/functional/options/pastetoggle_spec.lua b/test/functional/options/pastetoggle_spec.lua
index ec3c60fe37..a1f86f73ff 100644
--- a/test/functional/options/pastetoggle_spec.lua
+++ b/test/functional/options/pastetoggle_spec.lua
@@ -6,32 +6,35 @@ local command = helpers.command
 local eq = helpers.eq
 local eval = helpers.eval
 local sleep = helpers.sleep
+local expect = helpers.expect
 
 describe("'pastetoggle' option", function()
   before_each(function()
     clear()
     command('set nopaste')
-    command('set pastetoggle=a')
   end)
+
   it("toggles 'paste'", function()
-    eq(eval('&paste'), 0)
+    command('set pastetoggle=a')
+    eq(0, eval('&paste'))
     feed('a')
     -- Need another key so that the vgetorpeek() function returns.
     feed('j')
-    eq(eval('&paste'), 1)
+    eq(1, eval('&paste'))
   end)
-  it("multiple key 'pastetoggle' is waited for", function()
-    eq(eval('&paste'), 0)
-    local pastetoggle = 'lllll'
-    command('set pastetoggle=' .. pastetoggle)
-    command('set timeoutlen=1 ttimeoutlen=10000')
-    feed(pastetoggle:sub(0, 2))
-    -- sleep() for long enough that vgetorpeek() is gotten into, but short
-    -- enough that ttimeoutlen is not reached.
-    sleep(200)
-    feed(pastetoggle:sub(3, -1))
-    -- Need another key so that the vgetorpeek() function returns.
-    feed('j')
-    eq(eval('&paste'), 1)
+
+
+  it('does not wait for timeout', function()
+    command('set pastetoggle=abc')
+    command('set ttimeoutlen=9999999')
+    eq(0, eval('&paste'))
+    -- n.b. need <esc> to return from vgetorpeek()
+    feed('abc<esc>')
+    eq(1, eval('&paste'))
+    feed('ab')
+    sleep(10)
+    feed('c<esc>')
+    expect('bc')
+    eq(1, eval('&paste'))
   end)
 end)