From 4161589b561b87eda1c187c986c57b75fdc4b35c Mon Sep 17 00:00:00 2001 From: Yoni FIRROLONI Date: Sun, 8 Oct 2023 14:34:55 +0200 Subject: [PATCH 1/2] languages/php: init --- docs/manual/languages.adoc | 1 + docs/release-notes/rl-0.5.adoc | 5 ++ modules/languages/default.nix | 1 + modules/languages/php.nix | 100 +++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+) create mode 100644 modules/languages/php.nix diff --git a/docs/manual/languages.adoc b/docs/manual/languages.adoc index 4b97aea..8a981dc 100644 --- a/docs/manual/languages.adoc +++ b/docs/manual/languages.adoc @@ -16,6 +16,7 @@ Language specific support means there is a combination of language specific plug * Dart: <> * Go: <> * Lua: <> +* PHP: <> Adding support for more languages, and improving support for existing ones are great places where you can contribute with a PR. diff --git a/docs/release-notes/rl-0.5.adoc b/docs/release-notes/rl-0.5.adoc index 6c38c3c..2d02973 100644 --- a/docs/release-notes/rl-0.5.adoc +++ b/docs/release-notes/rl-0.5.adoc @@ -5,6 +5,11 @@ [[sec-release-0.5-changelog]] === Changelog +https://github.com/vagahbond[vagahbond]: +* Added phan language server for PHP. + +* Added phpactor language server for PHP. + https://github.com/horriblename[horriblename]: * Added transparency support for tokyonight theme. diff --git a/modules/languages/default.nix b/modules/languages/default.nix index e2d5b05..f7e16c6 100644 --- a/modules/languages/default.nix +++ b/modules/languages/default.nix @@ -25,6 +25,7 @@ in { ./svelte.nix ./java.nix ./lua.nix + ./php.nix ]; options.vim.languages = { diff --git a/modules/languages/php.nix b/modules/languages/php.nix new file mode 100644 index 0000000..43d2253 --- /dev/null +++ b/modules/languages/php.nix @@ -0,0 +1,100 @@ +{ + pkgs, + config, + lib, + ... +}: +with lib; +with builtins; let + cfg = config.vim.languages.php; + + defaultServer = "phpactor"; + servers = { + phpactor = { + package = pkgs.phpactor; + lspConfig = '' + lspconfig.phpactor.setup{ + capabilities = capabilities, + on_attach = default_on_attach, + cmd = ${ + if isList cfg.lsp.package + then nvim.lua.expToLua cfg.lsp.package + else '' + { + "${getExe cfg.lsp.package}", + "language-server" + }, + '' + } + } + ''; + }; + + phan = { + package = pkgs.php81Packages.phan; + lspConfig = '' + lspconfig.phan.setup{ + capabilities = capabilities, + on_attach = default_on_attach, + cmd = ${ + if isList cfg.lsp.package + then nvim.lua.expToLua cfg.lsp.package + else '' + { + "${getExe cfg.lsp.package} + "-m", + "json", + "--no-color", + "--no-progress-bar", + "-x", + "-u", + "-S", + "--language-server-on-stdin", + "--allow-polyfill-parser" + }, + '' + } + } + ''; + }; + }; +in { + options.vim.languages.php = { + enable = mkEnableOption "PHP language support"; + + treesitter = { + enable = mkEnableOption "Enable PHP treesitter" // {default = config.vim.languages.enableTreesitter;}; + package = nvim.types.mkGrammarOption pkgs "php"; + }; + + lsp = { + enable = mkEnableOption "PHP LSP support" // {default = config.vim.languages.enableLSP;}; + + server = mkOption { + description = "PHP LSP server to use"; + type = with types; enum (attrNames servers); + default = defaultServer; + }; + + package = mkOption { + description = "PHP LSP server package, or the command to run as a list of strings"; + example = ''[lib.getExe pkgs.jdt-language-server " - data " " ~/.cache/jdtls/workspace "]''; + type = with types; either package (listOf str); + default = servers.${cfg.lsp.server}.package; + }; + }; + }; + + config = mkIf cfg.enable (mkMerge [ + (mkIf cfg.treesitter.enable { + vim.treesitter.enable = true; + vim.treesitter.grammars = [cfg.treesitter.package]; + }) + (mkIf cfg.lsp.enable { + vim.lsp.lspconfig = { + enable = true; + sources.php-lsp = servers.${cfg.lsp.server}.lspConfig; + }; + }) + ]); +} From 0614dbfd0a68282a200e5921691eed0a02c74af4 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang <59727193+horriblename@users.noreply.github.com> Date: Tue, 10 Oct 2023 13:16:09 +0200 Subject: [PATCH 2/2] fix: typo --- modules/languages/php.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/languages/php.nix b/modules/languages/php.nix index 43d2253..4346e67 100644 --- a/modules/languages/php.nix +++ b/modules/languages/php.nix @@ -41,7 +41,7 @@ with builtins; let then nvim.lua.expToLua cfg.lsp.package else '' { - "${getExe cfg.lsp.package} + "${getExe cfg.lsp.package}", "-m", "json", "--no-color",