diff options
Diffstat (limited to 'lsp/phpactor.lua')
| -rw-r--r-- | lsp/phpactor.lua | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lsp/phpactor.lua b/lsp/phpactor.lua index 87e6c59d..9b7d3d82 100644 --- a/lsp/phpactor.lua +++ b/lsp/phpactor.lua @@ -4,17 +4,15 @@ --- --- Installation: https://phpactor.readthedocs.io/en/master/usage/standalone.html#global-installation -local util = require 'lspconfig.util' - return { cmd = { 'phpactor', 'language-server' }, filetypes = { 'php' }, root_dir = function(bufnr, on_dir) local fname = vim.api.nvim_buf_get_name(bufnr) local cwd = assert(vim.uv.cwd()) - local root = util.root_pattern('composer.json', '.git', '.phpactor.json', '.phpactor.yml')(fname) + local root = vim.fs.root(fname, { 'composer.json', '.git', '.phpactor.json', '.phpactor.yml' }) -- prefer cwd if root is a descendant - on_dir(vim.fs.relpath(cwd, root) and cwd or root) + on_dir(root and vim.fs.relpath(cwd, root) and cwd) end, } |