summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorShu Kutsuzawa <cappyzawa@gmail.com>2021-02-22 03:50:40 +0900
committerGitHub <noreply@github.com>2021-02-21 19:50:40 +0100
commite73581ddf00207fa0b17a07b43ac0f7785eb1811 (patch)
tree80691127184be8d90bafd20f9544ac915d001f3f /src/modules
parent509767adc02c39f206e7f0df15920ddba1b2444e (diff)
feat(ocaml): Configure when the module is shown (#2354)
This makes it possible to configure when the ocaml module is shown based on the contents of a directory. This should make it possible to be a lot more granular when configuring the module.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/ocaml.rs19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/modules/ocaml.rs b/src/modules/ocaml.rs
index 0c7bd8d7a..0b7a19dd1 100644
--- a/src/modules/ocaml.rs
+++ b/src/modules/ocaml.rs
@@ -4,29 +4,20 @@ use crate::configs::ocaml::OCamlConfig;
use crate::formatter::StringFormatter;
/// Creates a module with the current OCaml version
-///
-/// Will display the OCaml version if any of the following criteria are met:
-/// - Current directory contains a file with `.opam` extension or `_opam` directory
-/// - Current directory contains a `esy.lock` directory
-/// - Current directory contains a `dune` or `dune-project` file
-/// - Current directory contains a `jbuild` or `jbuild-ignore` file
-/// - Current directory contains a `.merlin` file
-/// - Current directory contains a file with `.ml`, `.mli`, `.re` or `.rei` extension
pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
+ let mut module = context.new_module("ocaml");
+ let config: OCamlConfig = OCamlConfig::try_load(module.config);
let is_ocaml_project = context
.try_begin_scan()?
- .set_files(&["dune", "dune-project", "jbuild", "jbuild-ignore", ".merlin"])
- .set_folders(&["_opam", "esy.lock"])
- .set_extensions(&["opam", "ml", "mli", "re", "rei"])
+ .set_files(&config.detect_files)
+ .set_folders(&config.detect_folders)
+ .set_extensions(&config.detect_extensions)
.is_match();
if !is_ocaml_project {
return None;
}
- let mut module = context.new_module("ocaml");
- let config: OCamlConfig = OCamlConfig::try_load(module.config);
-
let parsed = StringFormatter::new(config.format).and_then(|formatter| {
formatter
.map_meta(|variable, _| match variable {