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

1 files changed, 33 insertions, 21 deletions

diff --git a/test/functional/vimscript/sort_spec.lua b/test/functional/vimscript/sort_spec.lua
index e09949a0f2..bd3d0da146 100644
--- a/test/functional/vimscript/sort_spec.lua
+++ b/test/functional/vimscript/sort_spec.lua
@@ -1,11 +1,11 @@
 local helpers = require('test.functional.helpers')(after_each)
 
 local eq = helpers.eq
-local NIL = helpers.NIL
+local NIL = vim.NIL
 local eval = helpers.eval
 local clear = helpers.clear
-local meths = helpers.meths
-local funcs = helpers.funcs
+local api = helpers.api
+local fn = helpers.fn
 local command = helpers.command
 local exc_exec = helpers.exc_exec
 local pcall_err = helpers.pcall_err
@@ -14,31 +14,41 @@ before_each(clear)
 
 describe('sort()', function()
   it('errors out when sorting special values', function()
-    eq('Vim(call):E362: Using a boolean value as a Float',
-       exc_exec('call sort([v:true, v:false], "f")'))
+    eq(
+      'Vim(call):E362: Using a boolean value as a Float',
+      exc_exec('call sort([v:true, v:false], "f")')
+    )
   end)
 
-  it('sorts “wrong” values between -0.0001 and 0.0001, preserving order',
-  function()
-    meths.set_var('list', {true, false, NIL, {}, {a=42}, 'check',
-                           0.0001, -0.0001})
+  it('sorts “wrong” values between -0.0001 and 0.0001, preserving order', function()
+    api.nvim_set_var('list', {
+      true,
+      false,
+      NIL,
+      {},
+      { a = 42 },
+      'check',
+      0.0001,
+      -0.0001,
+    })
     command('call insert(g:list, function("tr"))')
-    local error_lines = funcs.split(
-        funcs.execute('silent! call sort(g:list, "f")'), '\n')
+    local error_lines = fn.split(fn.execute('silent! call sort(g:list, "f")'), '\n')
     local errors = {}
     for _, err in ipairs(error_lines) do
       errors[err] = true
     end
     eq({
-      ['E362: Using a boolean value as a Float']=true,
-      ['E891: Using a Funcref as a Float']=true,
-      ['E892: Using a String as a Float']=true,
-      ['E893: Using a List as a Float']=true,
-      ['E894: Using a Dictionary as a Float']=true,
-      ['E907: Using a special value as a Float']=true,
+      ['E362: Using a boolean value as a Float'] = true,
+      ['E891: Using a Funcref as a Float'] = true,
+      ['E892: Using a String as a Float'] = true,
+      ['E893: Using a List as a Float'] = true,
+      ['E894: Using a Dictionary as a Float'] = true,
+      ['E907: Using a special value as a Float'] = true,
     }, errors)
-    eq('[-1.0e-4, function(\'tr\'), v:true, v:false, v:null, [], {\'a\': 42}, \'check\', 1.0e-4]',
-       eval('string(g:list)'))
+    eq(
+      "[-1.0e-4, function('tr'), v:true, v:false, v:null, [], {'a': 42}, 'check', 1.0e-4]",
+      eval('string(g:list)')
+    )
   end)
 
   it('can yield E702 and stop sorting after that', function()
@@ -50,7 +60,9 @@ describe('sort()', function()
         return (a:a > a:b) - (a:a < a:b)
       endfunction
     ]])
-    eq('Vim(let):E745: Using a List as a Number',
-       pcall_err(command, 'let sl = sort([1, 0, [], 3, 2], "Cmp")'))
+    eq(
+      'Vim(let):E745: Using a List as a Number',
+      pcall_err(command, 'let sl = sort([1, 0, [], 3, 2], "Cmp")')
+    )
   end)
 end)