haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(java): Add detection for *.gradle files (#871) 

Currently the Java module detection looks for build.gradle specifically, but it's possible to rename build.gradle to *.gradle. This change adds Gradle files to the list of detected file extensions.
This commit is contained in:
Sam Rose 2020-01-24 15:22:30 +00:00 committed by Matan Kushner
parent 25b86dc82d
commit f4c095de92
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/config/README.md
View File

@ -774,8 +774,8 @@ pure_msg = "pure shell"
The `java` module shows the currently installed version of Java. The `java` module shows the currently installed version of Java.
The module will be shown if any of the following conditions are met: The module will be shown if any of the following conditions are met:
- The current directory contains a `pom.xml`, `build.gradle`, `build.gradle.kts` or `build.sbt` file - The current directory contains a `pom.xml`, `build.gradle.kts` or `build.sbt` file
- The current directory contains a file with the `.java`, `.class` or `.jar` extension - The current directory contains a file with the `.java`, `.class`, `.gradle` or `.jar` extension
### Options ### Options

8
src/modules/java.rs
View File

@ -8,13 +8,13 @@ use crate::utils;
/// Creates a module with the current Java version /// Creates a module with the current Java version
/// ///
/// Will display the Java version if any of the following criteria are met: /// Will display the Java version if any of the following criteria are met:
/// - Current directory contains a file with a `.java`, `.class` or `.jar` extension /// - Current directory contains a file with a `.java`, `.class`, `.gradle` or `.jar` extension
/// - Current directory contains a `pom.xml`, `build.gradle`, `build.gradle.kts` or `build.sbt` file /// - Current directory contains a `pom.xml`, `build.gradle.kts` or `build.sbt` file
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> { pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let is_java_project = context let is_java_project = context
.try_begin_scan()? .try_begin_scan()?
.set_files(&["pom.xml", "build.gradle", "build.gradle.kts", "build.sbt"]) .set_files(&["pom.xml", "build.gradle.kts", "build.sbt"])
.set_extensions(&["java", "class", "jar"]) .set_extensions(&["java", "class", "jar", "gradle"])
.is_match(); .is_match();
if !is_java_project { if !is_java_project {