summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorThomas O'Donnell <andytom@users.noreply.github.com>2021-02-21 19:57:09 +0100
committerGitHub <noreply@github.com>2021-02-21 19:57:09 +0100
commit64288c2e0437a570f0ff0e6f374f97967bb70ea0 (patch)
tree5aae8e1ddb1a3efb4143e7e9b3436ef66d34605d /src/modules
parentc0a209f27ccaf96d08aedc011dca05435fa2c900 (diff)
feat(java): Configure when the module is shown (#2353)
This makes it possible to configure when the java module is shown based on the contents of a directory.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/java.rs23
1 files changed, 6 insertions, 17 deletions
diff --git a/src/modules/java.rs b/src/modules/java.rs
index 26745d7d5..36a7abf51 100644
--- a/src/modules/java.rs
+++ b/src/modules/java.rs
@@ -7,32 +7,21 @@ use regex::Regex;
const JAVA_VERSION_PATTERN: &str = "(?P<version>[\\d\\.]+)[^\\s]*\\s(?:built|from)";
/// Creates a module with the current Java version
-///
-/// Will display the Java version if any of the following criteria are met:
-/// - Current directory contains a file with a `.java`, `.class`, `.jar`, `.gradle`, `.clj`, or `.cljc` extension
-/// - Current directory contains a `pom.xml`, `build.gradle.kts`, `build.sbt`, `.java-version`, `deps.edn`, `project.clj`, or `build.boot` file
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
+ let mut module = context.new_module("java");
+ let config: JavaConfig = JavaConfig::try_load(module.config);
+
let is_java_project = context
.try_begin_scan()?
- .set_files(&[
- "pom.xml",
- "build.gradle.kts",
- "build.sbt",
- ".java-version",
- "deps.edn",
- "project.clj",
- "build.boot",
- ])
- .set_extensions(&["java", "class", "jar", "gradle", "clj", "cljc"])
+ .set_files(&config.detect_files)
+ .set_extensions(&config.detect_extensions)
+ .set_folders(&config.detect_folders)
.is_match();
if !is_java_project {
return None;
}
- let mut module = context.new_module("java");
- let config: JavaConfig = JavaConfig::try_load(module.config);
-
let parsed = StringFormatter::new(config.format).and_then(|formatter| {
formatter
.map_meta(|var, _| match var {