mirror of
https://github.com/NotAShelf/nvf.git
synced 2026-04-27 11:55:22 +00:00
languages/php: refactor lsp.servers to use lsp/presets/<name>
This commit is contained in:
parent
01525bf49b
commit
0bd718b472
1 changed files with 11 additions and 57 deletions
|
|
@ -6,65 +6,18 @@
|
||||||
}: let
|
}: let
|
||||||
inherit (builtins) attrNames toString;
|
inherit (builtins) attrNames toString;
|
||||||
inherit (lib.options) mkEnableOption mkOption literalExpression;
|
inherit (lib.options) mkEnableOption mkOption literalExpression;
|
||||||
|
inherit (lib) genAttrs;
|
||||||
inherit (lib.meta) getExe;
|
inherit (lib.meta) getExe;
|
||||||
inherit (lib.modules) mkIf mkMerge;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
inherit (lib.types) enum int attrs listOf;
|
inherit (lib.types) enum int attrs listOf;
|
||||||
inherit (lib.nvim.lua) toLuaObject;
|
inherit (lib.nvim.lua) toLuaObject;
|
||||||
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
|
inherit (lib.nvim.types) mkGrammarOption;
|
||||||
inherit (lib.nvim.attrsets) mapListToAttrs;
|
inherit (lib.nvim.attrsets) mapListToAttrs;
|
||||||
inherit (lib.generators) mkLuaInline;
|
|
||||||
|
|
||||||
cfg = config.vim.languages.php;
|
cfg = config.vim.languages.php;
|
||||||
|
|
||||||
defaultServers = ["phpactor"];
|
defaultServers = ["phpactor"];
|
||||||
servers = {
|
servers = ["phpactor" "phan" "intelephense"];
|
||||||
phpactor = {
|
|
||||||
enable = true;
|
|
||||||
cmd = [(getExe pkgs.phpactor) "language-server"];
|
|
||||||
filetypes = ["php"];
|
|
||||||
root_markers = [".git" "composer.json" ".phpactor.json" ".phpactor.yml"];
|
|
||||||
workspace_required = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
phan = {
|
|
||||||
enable = true;
|
|
||||||
cmd = [
|
|
||||||
(getExe pkgs.php81Packages.phan)
|
|
||||||
"-m"
|
|
||||||
"json"
|
|
||||||
"--no-color"
|
|
||||||
"--no-progress-bar"
|
|
||||||
"-x"
|
|
||||||
"-u"
|
|
||||||
"-S"
|
|
||||||
"--language-server-on-stdin"
|
|
||||||
"--allow-polyfill-parser"
|
|
||||||
];
|
|
||||||
filetypes = ["php"];
|
|
||||||
root_dir =
|
|
||||||
mkLuaInline
|
|
||||||
/*
|
|
||||||
lua
|
|
||||||
*/
|
|
||||||
''
|
|
||||||
function(bufnr, on_dir)
|
|
||||||
local fname = vim.api.nvim_buf_get_name(bufnr)
|
|
||||||
local cwd = assert(vim.uv.cwd())
|
|
||||||
local root = vim.fs.root(fname, { 'composer.json', '.git' })
|
|
||||||
|
|
||||||
-- prefer cwd if root is a descendant
|
|
||||||
on_dir(root and vim.fs.relpath(cwd, root) and cwd)
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
intelephense = {
|
|
||||||
enable = true;
|
|
||||||
cmd = [(getExe pkgs.intelephense) "--stdio"];
|
|
||||||
filetypes = ["php"];
|
|
||||||
root_markers = ["composer.json" ".git"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
defaultFormat = ["php_cs_fixer"];
|
defaultFormat = ["php_cs_fixer"];
|
||||||
formats = {
|
formats = {
|
||||||
|
|
@ -103,7 +56,7 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
servers = mkOption {
|
servers = mkOption {
|
||||||
type = deprecatedSingleOrListOf "vim.language.php.lsp.servers" (enum (attrNames servers));
|
type = listOf (enum servers);
|
||||||
default = defaultServers;
|
default = defaultServers;
|
||||||
description = "PHP LSP server to use";
|
description = "PHP LSP server to use";
|
||||||
};
|
};
|
||||||
|
|
@ -159,12 +112,13 @@ in {
|
||||||
})
|
})
|
||||||
|
|
||||||
(mkIf cfg.lsp.enable {
|
(mkIf cfg.lsp.enable {
|
||||||
vim.lsp.servers =
|
vim.lsp = {
|
||||||
mapListToAttrs (n: {
|
presets = genAttrs cfg.lsp.servers (_: {enable = true;});
|
||||||
name = n;
|
servers = genAttrs cfg.lsp.servers (_: {
|
||||||
value = servers.${n};
|
filetypes = ["php"];
|
||||||
})
|
root_markers = ["composer.json"];
|
||||||
cfg.lsp.servers;
|
});
|
||||||
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
(mkIf cfg.format.enable {
|
(mkIf cfg.format.enable {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue