Merge remote-tracking branch 'upstream/master' into usermarks

6 files changed, 76 insertions, 65 deletions

diff --git a/test/unit/buffer_spec.lua b/test/unit/buffer_spec.lua
index 204d713fb7..5dccc2f5a2 100644
--- a/test/unit/buffer_spec.lua
+++ b/test/unit/buffer_spec.lua
@@ -9,6 +9,7 @@ local NULL    = helpers.NULL
 
 local globals = helpers.cimport("./src/nvim/globals.h")
 local buffer = helpers.cimport("./src/nvim/buffer.h")
+local stl = helpers.cimport("./src/nvim/statusline.h")
 
 describe('buffer functions', function()
 
@@ -228,7 +229,7 @@ describe('buffer functions', function()
       local fillchar = arg.fillchar or (' '):byte()
       local maximum_cell_count = arg.maximum_cell_count or buffer_byte_size
 
-      return buffer.build_stl_str_hl(globals.curwin,
+      return stl.build_stl_str_hl(globals.curwin,
                                      output_buffer,
                                      buffer_byte_size,
                                      to_cstr(pat),
diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua
index e61b568f3a..6387f89fe4 100644
--- a/test/unit/eval/typval_spec.lua
+++ b/test/unit/eval/typval_spec.lua
@@ -2992,9 +2992,9 @@ describe('typval.c', function()
             {lib.VAR_FUNC, {v_string=NULL}, 'E729: using Funcref as a String', ''},
             {lib.VAR_LIST, {v_list=NULL}, 'E730: using List as a String', ''},
             {lib.VAR_DICT, {v_dict=NULL}, 'E731: using Dictionary as a String', ''},
-            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'null'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'true'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'false'},
+            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'v:null'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'v:true'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'v:false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', ''},
           }) do
             -- Using to_cstr in place of Neovim allocated string, cannot
@@ -3036,9 +3036,9 @@ describe('typval.c', function()
             {lib.VAR_FUNC, {v_string=NULL}, 'E729: using Funcref as a String', nil},
             {lib.VAR_LIST, {v_list=NULL}, 'E730: using List as a String', nil},
             {lib.VAR_DICT, {v_dict=NULL}, 'E731: using Dictionary as a String', nil},
-            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'null'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'true'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'false'},
+            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'v:null'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'v:true'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'v:false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', nil},
           }) do
             -- Using to_cstr, cannot free with tv_clear
@@ -3078,9 +3078,9 @@ describe('typval.c', function()
             {lib.VAR_FUNC, {v_string=NULL}, 'E729: using Funcref as a String', ''},
             {lib.VAR_LIST, {v_list=NULL}, 'E730: using List as a String', ''},
             {lib.VAR_DICT, {v_dict=NULL}, 'E731: using Dictionary as a String', ''},
-            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'null'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'true'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'false'},
+            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'v:null'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'v:true'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'v:false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', ''},
           }) do
             -- Using to_cstr, cannot free with tv_clear
@@ -3121,9 +3121,9 @@ describe('typval.c', function()
             {lib.VAR_FUNC, {v_string=NULL}, 'E729: using Funcref as a String', nil},
             {lib.VAR_LIST, {v_list=NULL}, 'E730: using List as a String', nil},
             {lib.VAR_DICT, {v_dict=NULL}, 'E731: using Dictionary as a String', nil},
-            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'null'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'true'},
-            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'false'},
+            {lib.VAR_SPECIAL, {v_special=lib.kSpecialVarNull}, nil, 'v:null'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarTrue}, nil, 'v:true'},
+            {lib.VAR_BOOL, {v_bool=lib.kBoolVarFalse}, nil, 'v:false'},
             {lib.VAR_UNKNOWN, nil, 'E908: using an invalid value as a String', nil},
           }) do
             -- Using to_cstr, cannot free with tv_clear
diff --git a/test/unit/indent_spec.lua b/test/unit/indent_spec.lua
new file mode 100644
index 0000000000..ec86822b55
--- /dev/null
+++ b/test/unit/indent_spec.lua
@@ -0,0 +1,30 @@
+local helpers = require("test.unit.helpers")(after_each)
+local itp = helpers.gen_itp(it)
+
+local eq      = helpers.eq
+
+local indent = helpers.cimport("./src/nvim/indent.h")
+local globals = helpers.cimport("./src/nvim/globals.h")
+
+describe('get_sts_value', function()
+  itp([[returns 'softtabstop' when it is non-negative]], function()
+    globals.curbuf.b_p_sts = 5
+    eq(5, indent.get_sts_value())
+
+    globals.curbuf.b_p_sts = 0
+    eq(0, indent.get_sts_value())
+  end)
+
+  itp([[returns "effective shiftwidth" when 'softtabstop' is negative]], function()
+    local shiftwidth = 2
+    globals.curbuf.b_p_sw = shiftwidth
+    local tabstop = 5
+    globals.curbuf.b_p_ts = tabstop
+    globals.curbuf.b_p_sts = -2
+    eq(shiftwidth, indent.get_sts_value())
+
+    shiftwidth = 0
+    globals.curbuf.b_p_sw = shiftwidth
+    eq(tabstop, indent.get_sts_value())
+  end)
+end)
diff --git a/test/unit/option_spec.lua b/test/unit/option_spec.lua
deleted file mode 100644
index b8b8a435bc..0000000000
--- a/test/unit/option_spec.lua
+++ /dev/null
@@ -1,52 +0,0 @@
-local helpers = require("test.unit.helpers")(after_each)
-local itp = helpers.gen_itp(it)
-
-local to_cstr = helpers.to_cstr
-local eq      = helpers.eq
-
-local option = helpers.cimport("./src/nvim/option.h")
-local globals = helpers.cimport("./src/nvim/globals.h")
-
-local check_ff_value = function(ff)
-  return option.check_ff_value(to_cstr(ff))
-end
-
-describe('check_ff_value', function()
-
-  itp('views empty string as valid', function()
-    eq(1, check_ff_value(""))
-  end)
-
-  itp('views "unix", "dos" and "mac" as valid', function()
-    eq(1, check_ff_value("unix"))
-    eq(1, check_ff_value("dos"))
-    eq(1, check_ff_value("mac"))
-  end)
-
-  itp('views "foo" as invalid', function()
-    eq(0, check_ff_value("foo"))
-  end)
-end)
-
-describe('get_sts_value', function()
-  itp([[returns 'softtabstop' when it is non-negative]], function()
-    globals.curbuf.b_p_sts = 5
-    eq(5, option.get_sts_value())
-
-    globals.curbuf.b_p_sts = 0
-    eq(0, option.get_sts_value())
-  end)
-
-  itp([[returns "effective shiftwidth" when 'softtabstop' is negative]], function()
-    local shiftwidth = 2
-    globals.curbuf.b_p_sw = shiftwidth
-    local tabstop = 5
-    globals.curbuf.b_p_ts = tabstop
-    globals.curbuf.b_p_sts = -2
-    eq(shiftwidth, option.get_sts_value())
-
-    shiftwidth = 0
-    globals.curbuf.b_p_sw = shiftwidth
-    eq(tabstop, option.get_sts_value())
-  end)
-end)
diff --git a/test/unit/optionstr_spec.lua b/test/unit/optionstr_spec.lua
new file mode 100644
index 0000000000..f8122f4fe0
--- /dev/null
+++ b/test/unit/optionstr_spec.lua
@@ -0,0 +1,28 @@
+local helpers = require("test.unit.helpers")(after_each)
+local itp = helpers.gen_itp(it)
+
+local to_cstr = helpers.to_cstr
+local eq      = helpers.eq
+
+local option = helpers.cimport("./src/nvim/optionstr.h")
+
+local check_ff_value = function(ff)
+  return option.check_ff_value(to_cstr(ff))
+end
+
+describe('check_ff_value', function()
+
+  itp('views empty string as valid', function()
+    eq(1, check_ff_value(""))
+  end)
+
+  itp('views "unix", "dos" and "mac" as valid', function()
+    eq(1, check_ff_value("unix"))
+    eq(1, check_ff_value("dos"))
+    eq(1, check_ff_value("mac"))
+  end)
+
+  itp('views "foo" as invalid', function()
+    eq(0, check_ff_value("foo"))
+  end)
+end)
diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua
index fb476397e6..eb23a3cff1 100644
--- a/test/unit/path_spec.lua
+++ b/test/unit/path_spec.lua
@@ -640,6 +640,10 @@ describe('path.c', function()
       eq(2, path_with_url([[test-abc:\\xyz\foo\b3]]))
       eq(0, path_with_url([[-test://xyz/foo/b4]]))
       eq(0, path_with_url([[test-://xyz/foo/b5]]))
+      eq(1, path_with_url([[test-C:/xyz/foo/b5]]))
+      eq(1, path_with_url([[test-custom:/xyz/foo/b5]]))
+      eq(0, path_with_url([[c:/xyz/foo/b5]]))
+      eq(0, path_with_url([[C:/xyz/foo/b5]]))
     end)
   end)
 end)