diff options
| author | William Boman <william@redwill.se> | 2021-05-17 15:16:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-17 15:16:07 +0200 |
| commit | 79745b0a25ffb386918eec03ded27f7a7da1b96f (patch) | |
| tree | 4d3f77e1a02b10fc1e58ae1df4f2a81dea25d561 /lua/nvim-lsp-installer/installers | |
| parent | remove logo.png from repo (diff) | |
| download | mason-79745b0a25ffb386918eec03ded27f7a7da1b96f.tar mason-79745b0a25ffb386918eec03ded27f7a7da1b96f.tar.gz mason-79745b0a25ffb386918eec03ded27f7a7da1b96f.tar.bz2 mason-79745b0a25ffb386918eec03ded27f7a7da1b96f.tar.lz mason-79745b0a25ffb386918eec03ded27f7a7da1b96f.tar.xz mason-79745b0a25ffb386918eec03ded27f7a7da1b96f.tar.zst mason-79745b0a25ffb386918eec03ded27f7a7da1b96f.zip | |
s/install_cmd/installer/g (#15)
Diffstat (limited to 'lua/nvim-lsp-installer/installers')
| -rw-r--r-- | lua/nvim-lsp-installer/installers/shell.lua | 10 | ||||
| -rw-r--r-- | lua/nvim-lsp-installer/installers/zx.lua | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/lua/nvim-lsp-installer/installers/shell.lua b/lua/nvim-lsp-installer/installers/shell.lua index e169d184..37d99af9 100644 --- a/lua/nvim-lsp-installer/installers/shell.lua +++ b/lua/nvim-lsp-installer/installers/shell.lua @@ -1,7 +1,7 @@ local M = {} function M.raw(raw_script) - return function (server, on_exit) + return function (server, callback) local shell = vim.o.shell vim.o.shell = "/bin/bash" vim.cmd [[new]] @@ -9,7 +9,13 @@ function M.raw(raw_script) "set -e;\n" .. raw_script, { cwd = server._root_dir, - on_exit = on_exit + on_exit = function (_, exit_code) + if exit_code ~= 0 then + callback(false, ("Exit code was non-successful: %d"):format(exit_code)) + else + callback(true, nil) + end + end } ) vim.o.shell = shell diff --git a/lua/nvim-lsp-installer/installers/zx.lua b/lua/nvim-lsp-installer/installers/zx.lua index 20ee9bb1..92027ef8 100644 --- a/lua/nvim-lsp-installer/installers/zx.lua +++ b/lua/nvim-lsp-installer/installers/zx.lua @@ -44,7 +44,7 @@ end function M.file(relpath) local script_path = path.realpath(relpath, 3) - return function (server, on_exit) + return function (server, callback) M.install_zx(function () vim.cmd [[new]] vim.fn.termopen(("set -e; %q %q"):format( @@ -52,7 +52,13 @@ function M.file(relpath) script_path ), { cwd = server._root_dir, - on_exit = on_exit + on_exit = function (_, exit_code) + if exit_code ~= 0 then + callback(false, ("Exit code was non-successful: %d"):format(exit_code)) + else + callback(true, nil) + end + end }) vim.cmd [[startinsert]] -- so that the buffer tails the term log nicely end, false) |