From 8e96f0aaa325b992d17a3e7c9613344680375791 Mon Sep 17 00:00:00 2001 From: Soliprem <73885403+Soliprem@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:00:31 +0200 Subject: [PATCH 1/4] R: adding LSP (#378) * r: implementing lsp * r: version bump to context fixes treesitter bug * r: changing treesitter package definition to mkGrammarOption * added changelog entry * docs: wording --------- Co-authored-by: raf --- configuration.nix | 1 + docs/release-notes/rl-0.7.md | 5 ++ flake.lock | 6 +-- modules/plugins/languages/default.nix | 1 + modules/plugins/languages/r.nix | 78 +++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 modules/plugins/languages/r.nix diff --git a/configuration.nix b/configuration.nix index 7479012..08b0f9b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -59,6 +59,7 @@ isMaximal: { python.enable = isMaximal; dart.enable = isMaximal; bash.enable = isMaximal; + r.enable = isMaximal; tailwind.enable = isMaximal; typst.enable = isMaximal; clang = { diff --git a/docs/release-notes/rl-0.7.md b/docs/release-notes/rl-0.7.md index cf250e0..7fd4876 100644 --- a/docs/release-notes/rl-0.7.md +++ b/docs/release-notes/rl-0.7.md @@ -108,6 +108,7 @@ everyone. plugin's options can now be found under `indentBlankline.setupOpts`, the previous iteration of the module also included out of place/broken options, which have been removed for the time being. These are: + - `listChar` - this was already unused - `fillChar` - this had nothing to do with the plugin, please configure it yourself by adding `vim.opt.listchars:append({ space = '' })` to your @@ -191,3 +192,7 @@ everyone. - Telescope: - Fixed `project-nvim` command and keybinding - Added default ikeybind/command for `Telescope resume` (`fr`) + +[Soliprem](https://github.com/Soliprem) + +- Add LSP and Treesitter support for R under `vim.languages.R`. diff --git a/flake.lock b/flake.lock index 377c084..9e11e8c 100644 --- a/flake.lock +++ b/flake.lock @@ -1280,11 +1280,11 @@ "plugin-nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1716388265, - "narHash": "sha256-EY5Si6t7LXcxOP3ubGAAMd3lgbeaCOCIybSKi1Ucx98=", + "lastModified": 1726947805, + "narHash": "sha256-5oN/vyhSqDqjLEzECj01A7A+Yq7U1H1HXLbzkC1Ljqw=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683", + "rev": "3d5390c49e3f8fe457b376df2a49aa39d75b7911", "type": "github" }, "original": { diff --git a/modules/plugins/languages/default.nix b/modules/plugins/languages/default.nix index e86a521..28c1fd8 100644 --- a/modules/plugins/languages/default.nix +++ b/modules/plugins/languages/default.nix @@ -17,6 +17,7 @@ in { ./ocaml.nix ./php.nix ./python.nix + ./r.nix ./rust.nix ./sql.nix ./svelte.nix diff --git a/modules/plugins/languages/r.nix b/modules/plugins/languages/r.nix new file mode 100644 index 0000000..27d7c99 --- /dev/null +++ b/modules/plugins/languages/r.nix @@ -0,0 +1,78 @@ +{ + config, + pkgs, + lib, + ... +}: let + inherit (builtins) attrNames; + inherit (lib.options) mkEnableOption mkOption literalExpression; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.lists) isList; + inherit (lib.types) enum either listOf package str; + inherit (lib.nvim.lua) expToLua; + inherit (lib.nvim.types) mkGrammarOption; + + cfg = config.vim.languages.r; + + r-with-languageserver = pkgs.rWrapper.override { + packages = with pkgs.rPackages; [languageserver]; + }; + + defaultServer = "r_language_server"; + servers = { + r_language_server = { + package = pkgs.writeShellScriptBin "r_lsp" '' + ${r-with-languageserver}/bin/R --slave -e "languageserver::run()" + ''; + lspConfig = '' + lspconfig.r_language_server.setup{ + capabilities = capabilities; + on_attach = default_on_attach; + cmd = ${ + if isList cfg.lsp.package + then expToLua cfg.lsp.package + else ''{"${lib.getExe cfg.lsp.package}"}'' + } + } + ''; + }; + }; +in { + options.vim.languages.r = { + enable = mkEnableOption "R language support"; + + treesitter = { + enable = mkEnableOption "R treesitter" // {default = config.vim.languages.enableTreesitter;}; + package = mkGrammarOption pkgs "r"; + }; + + lsp = { + enable = mkEnableOption "R LSP support" // {default = config.vim.languages.enableLSP;}; + + server = mkOption { + description = "R LSP server to use"; + type = enum (attrNames servers); + default = defaultServer; + }; + + package = mkOption { + description = "R LSP server package, or the command to run as a list of strings"; + example = literalExpression "[ (lib.getExe pkgs.jdt-language-server) \"-data\" \"~/.cache/jdtls/workspace\" ]"; + type = 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; + vim.lsp.lspconfig.sources.r-lsp = servers.${cfg.lsp.server}.lspConfig; + }) + ]); +} From a56a83bd460c2424c0eb23c2d4f4221e40c286f5 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Thu, 26 Sep 2024 00:29:52 +0300 Subject: [PATCH 2/4] flake: bump neo-tree --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9e11e8c..91fc506 100644 --- a/flake.lock +++ b/flake.lock @@ -863,11 +863,11 @@ "plugin-neo-tree-nvim": { "flake": false, "locked": { - "lastModified": 1713050882, - "narHash": "sha256-cZwOVpdMT0NCtp6Ha592QA2RzKVS6LhXXcjfDBCQ+0k=", + "lastModified": 1726542367, + "narHash": "sha256-Lqt0KJNT9HmpJwZoWChYeVBrDWhscRe8COqVCwgcTwk=", "owner": "nvim-neo-tree", "repo": "neo-tree.nvim", - "rev": "22e566aeb075c94f670f34077e05ba95190dfb4a", + "rev": "a77af2e764c5ed4038d27d1c463fa49cd4794e07", "type": "github" }, "original": { From b4c06c71dc2b60e0c6cd9d6188c0f7ac2dc89dfe Mon Sep 17 00:00:00 2001 From: Gerg-L <88247690+Gerg-L@users.noreply.github.com> Date: Wed, 25 Sep 2024 22:46:47 +0000 Subject: [PATCH 3/4] docs: fix declerations (#381) * docs: fix declerations * fix: formatting for your baldness --- docs/default.nix | 2 +- modules/modules.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/default.nix b/docs/default.nix index cce02b1..48cff56 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -74,7 +74,7 @@ (lib.removePrefix (toString ../.)) (lib.removePrefix "/") (x: { - url = "https://github.com/NotAShelf/nvf/blob/main/${decl}"; + url = "https://github.com/NotAShelf/nvf/blob/main/${x}"; name = ""; }) ] diff --git a/modules/modules.nix b/modules/modules.nix index 195652d..1204e43 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -8,7 +8,7 @@ # The core neovim modules. # Contains configuration for core neovim features # such as spellchecking, mappings, and the init script (init.vim). - neovim = map (p: "${./neovim}/${p}") [ + neovim = map (p: ./neovim + "/${p}") [ "init" "mappings" ]; @@ -16,7 +16,7 @@ # Individual plugin modules, separated by the type of plugin. # While adding a new type, you must make sure your type is # included in the list below. - plugins = map (p: "${./plugins}/${p}") [ + plugins = map (p: ./plugins + "/${p}") [ "assistant" "autopairs" "comments" @@ -46,7 +46,7 @@ # The neovim wrapper, used to build a wrapped neovim package # using the configuration passed in `neovim` and `plugins` modules. - wrapper = map (p: "${./wrapper}/${p}") [ + wrapper = map (p: ./wrapper + "/${p}") [ "build" "rc" "warnings" @@ -54,7 +54,7 @@ # Extra modules, such as deprecation warnings # or renames in one place. - extra = map (p: "${./extra}/${p}") [ + extra = map (p: ./extra + "/${p}") [ "deprecations.nix" ]; in From c957b23aaa97034d075fffd303afb86140aa7620 Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 26 Sep 2024 17:07:04 +0200 Subject: [PATCH 4/4] docs: fix dead links in CONTRIBUTING + put PR template in its appropriate location (#384) --- .github/CONTRIBUTING.md | 2 +- .github/{PULL_REQUEST_TEMPLATE => }/pull_request_template.md | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename .github/{PULL_REQUEST_TEMPLATE => }/pull_request_template.md (100%) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 436a68e..d85c28d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -16,7 +16,7 @@ If you have any questions regarding those files, feel free to open an issue or [ ## Contributing -The contribution process is mostly documented in the [pull request template](.github/pull_request_template.md). You will find a checklist of items to complete before submitting a pull request. Please make sure you complete it before submitting a pull request. If you are unsure about any of the items, please ask. +The contribution process is mostly documented in the [pull request template](pull_request_template.md). You will find a checklist of items to complete before submitting a pull request. Please make sure you complete it before submitting a pull request. If you are unsure about any of the items, please ask. ### Guidelines diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/pull_request_template.md similarity index 100% rename from .github/PULL_REQUEST_TEMPLATE/pull_request_template.md rename to .github/pull_request_template.md