Remove a few more uses of the vimscript API where Lua API now exists.

Author: Julian

lua/lean/abbreviations.lua

@@ -13,10 +13,14 @@ function abbreviations.load()
   if _MEMOIZED ~= nil then
     return _MEMOIZED
   end
-  local this_file = debug.getinfo(2, 'S').source:sub(2)
-  local base_directory = vim.fn.fnamemodify(this_file, ':h:h:h')
-  local path = base_directory .. '/vscode-lean/abbreviations.json'
-  _MEMOIZED = vim.fn.json_decode(vim.fn.readfile(path))
+  local this_dir = vim.fs.dirname(debug.getinfo(2, 'S').source:sub(2))
+  local path = vim.fs.joinpath(this_dir, '../../vscode-lean/abbreviations.json')
+  local file = io.open(path, 'r')
+  if not file then
+    error(('Unable to read abbreviations from %q'):format(path))
+  end
+  _MEMOIZED = vim.json.decode(file:read '*a')
+  file:close()
   return _MEMOIZED
 end
 

lua/lean/init.lua

@@ -201,7 +201,7 @@ function lean.current_search_paths()
     .system({ 'lake', 'setup-file', vim.api.nvim_buf_get_name(0) }, { cwd = root })
     :wait()
   if result.code == 0 then
-    vim.list_extend(paths, vim.fn.json_decode(result.stdout).paths.srcPath)
+    vim.list_extend(paths, vim.json.decode(result.stdout).paths.srcPath)
   end
 
   return vim

lua/lean/loogle.lua

@@ -30,7 +30,7 @@ function loogle.search(type)
     error('Loogle returned status code: ' .. res.status)
   end
 
-  local body = vim.fn.json_decode(res.body)
+  local body = vim.json.decode(res.body)
   if body.error then
     return nil, body.error
   end

scripts/minimal_init.lua

@@ -2,9 +2,9 @@ vim.o.display = 'lastline' -- Avoid neovim/neovim#11362
 vim.o.directory = ''
 vim.o.shada = ''
 
-local __file__ = debug.getinfo(1).source:match '@(.*)$'
-local lean_nvim_dir = vim.fn.fnamemodify(__file__, ':p:h:h')
-local packpath = lean_nvim_dir .. '/packpath/*'
+local this_dir = vim.fs.dirname(debug.getinfo(1, 'S').source:sub(2))
+local lean_nvim_dir = vim.fs.dirname(this_dir)
+local packpath = vim.fs.joinpath(lean_nvim_dir, 'packpath/*')
 vim.opt.runtimepath:append(packpath)
 vim.opt.runtimepath:append(lean_nvim_dir)
 
@@ -18,7 +18,7 @@ vim.cmd [[
 
 -- plenary forks subprocesses, so enable coverage here when appropriate
 if vim.env.LEAN_NVIM_COVERAGE then
-  local luapath = lean_nvim_dir .. '/luapath'
+  local luapath = vim.fs.joinpath(lean_nvim_dir, 'luapath')
   package.path = package.path
     .. ';'
     .. luapath