Merge pull request #1539 from snoweuph/feat/java

Java Extensions

docs/manual/release-notes/rl-0.9.md

@@ -383,6 +383,12 @@
 
 - Extend `languages.asm` to support more filetypes out of the box.
 
+- Added {option}`vim.languages.java.extensions.maven-nvim.enable` for Maven
+  support;
+
+- Added {option}`vim.languages.java.extensions.gradle-nvim.enable` for Gradle
+  support;
+
 - Didn't Add
   [`syntax-gaslighting`](https://github.com/NotAShelf/syntax-gaslighting.nvim),
   you're crazy.

modules/plugins/languages/java.nix

@@ -7,8 +7,9 @@
   inherit (lib.options) literalExpression mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib) genAttrs;
-  inherit (lib.types) listOf;
+  inherit (lib.types) listOf str;
-  inherit (lib.nvim.types) mkGrammarOption enumWithRename;
+  inherit (lib.meta) getExe;
+  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption enumWithRename;
 
   cfg = config.vim.languages.java;
 
@@ -46,6 +47,44 @@ in {
         description = "Java LSP server to use";
       };
     };
+
+    extensions = {
+      maven-nvim = {
+        enable = mkEnableOption "maven integration";
+        setupOpts = mkPluginSetupOption "maven-nvim" {
+          mvn_executable = mkOption {
+            type = str;
+            default = getExe pkgs.maven;
+            defaultText = literalExpression "getExe pkgs.maven";
+            description = ''
+              The maven executable to use.
+            '';
+            example = ''
+              - `"mvn"`: to use the maven from the `PATH`.
+              - `"./mvnw"`: to use the projects maven.
+              - `"$${getExe pkgs.maven}"`: to use maven from a nix package.
+            '';
+          };
+        };
+      };
+      gradle-nvim = {
+        enable = mkEnableOption "gradle integration";
+        setupOpts = mkPluginSetupOption "gradle-nvim" {
+          gadle_executable = mkOption {
+            type = str;
+            default = getExe pkgs.gradle;
+            defaultText = literalExpression "getExe pkgs.gradle";
+            description = ''
+              The gradle executable to use.
+            '';
+            example = ''
+              - `"gradle"`: to use the gradle from the `PATH`.
+              - `"$${getExe pkgs.gradle}"`: to use gradle from a nix package.
+            '';
+          };
+        };
+      };
+    };
   };
 
   config = mkIf cfg.enable (mkMerge [
@@ -62,5 +101,31 @@ in {
       vim.treesitter.enable = true;
       vim.treesitter.grammars = [cfg.treesitter.package];
     })
+
+    (mkIf cfg.extensions.maven-nvim.enable {
+      vim = mkMerge [
+        {
+          startPlugins = ["nui-nvim" "plenary-nvim"];
+          lazy.plugins.maven-nvim = {
+            package = "maven-nvim";
+            setupModule = "maven";
+            setupOpts = cfg.extensions.maven-nvim.setupOpts;
+          };
+        }
+      ];
+    })
+
+    (mkIf cfg.extensions.gradle-nvim.enable {
+      vim = mkMerge [
+        {
+          startPlugins = ["nui-nvim" "plenary-nvim"];
+          lazy.plugins.gradle-nvim = {
+            package = "gradle-nvim";
+            setupModule = "gradle";
+            setupOpts = cfg.extensions.gradle-nvim.setupOpts;
+          };
+        }
+      ];
+    })
   ]);
 }

npins/sources.json

@@ -702,6 +702,19 @@
       "url": "https://api.github.com/repos/olexsmir/gopher.nvim/tarball/refs/tags/v0.6.1",
       "hash": "sha256-tfagWNHlfCRQ0BMihFCubKgMUpp5QtFl91ja4/Y2/gI="
     },
+    "gradle-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "oclay1st",
+        "repo": "gradle.nvim"
+      },
+      "branch": "main",
+      "submodules": false,
+      "revision": "dac2cdd20cbc55c588bdcda1b4ee6f9b280d9e79",
+      "url": "https://github.com/oclay1st/gradle.nvim/archive/dac2cdd20cbc55c588bdcda1b4ee6f9b280d9e79.tar.gz",
+      "hash": "sha256-wcUMX9Z1KKkZWs79OnunyGS4yYEeHiiTjtIHUjq1A3k="
+    },
     "gruber-darker": {
       "type": "Git",
       "repository": {
@@ -1063,6 +1076,19 @@
       "url": "https://github.com/OXY2DEV/markview.nvim/archive/1861f959599ae03cfd59f56222a542035b0cd947.tar.gz",
       "hash": "sha256-T6ZVy7o9sSGa2vOolvmL7KO3cXkyEwJ9F4n6BbWdPGk="
     },
+    "maven-nvim": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "oclay1st",
+        "repo": "maven.nvim"
+      },
+      "branch": "main",
+      "submodules": false,
+      "revision": "8d53fe5d5e4b0417c1e923f1c44f769192435411",
+      "url": "https://github.com/oclay1st/maven.nvim/archive/8d53fe5d5e4b0417c1e923f1c44f769192435411.tar.gz",
+      "hash": "sha256-fzen+eJtenvnxRPWXHnnmp+r1g2iaEFOEYUPblViroY="
+    },
     "mellow": {
       "type": "Git",
       "repository": {