Merge branch 'master' of https://github.com/neovim/neovim into rahmtmp

3 files changed, 42 insertions, 36 deletions

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
index b8b8a435bc..b3c3718035 100644
--- a/test/unit/option_spec.lua
+++ b/test/unit/option_spec.lua
@@ -5,7 +5,6 @@ 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))
@@ -27,26 +26,3 @@ describe('check_ff_value', 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)