diff options
author | Thomas O'Donnell <andytom@users.noreply.github.com> | 2021-02-14 22:21:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-14 22:21:52 +0100 |
commit | d0951db35aaa46b21a604a08a96c878a4da72c87 (patch) | |
tree | 4042672a81aa9933377673b7763f0888148f1a29 /src | |
parent | d4843545aab6e67470a3ff02dcec547fa1de3eed (diff) |
feat(dart): Configure when the module is shown (#2312)
* feat(dart): Configure when the module is shown
This makes it possible to configure when the dart 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.
* docs(dart): add missing detected files
* removed invalid comment
Diffstat (limited to 'src')
-rw-r--r-- | src/configs/dart.rs | 6 | ||||
-rw-r--r-- | src/modules/dart.rs | 17 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/configs/dart.rs b/src/configs/dart.rs index 6fafdc6bb..cde1832f1 100644 --- a/src/configs/dart.rs +++ b/src/configs/dart.rs @@ -8,6 +8,9 @@ pub struct DartConfig<'a> { pub symbol: &'a str, pub style: &'a str, pub disabled: bool, + pub detect_extensions: Vec<&'a str>, + pub detect_files: Vec<&'a str>, + pub detect_folders: Vec<&'a str>, } impl<'a> RootModuleConfig<'a> for DartConfig<'a> { @@ -17,6 +20,9 @@ impl<'a> RootModuleConfig<'a> for DartConfig<'a> { symbol: "🎯 ", style: "bold blue", disabled: false, + detect_extensions: vec!["dart"], + detect_files: vec!["pubspec.yaml", "pubspec.yml", "pubspec.lock"], + detect_folders: vec![".dart_tool"], } } } diff --git a/src/modules/dart.rs b/src/modules/dart.rs index 5206bd7a9..00b4cf353 100644 --- a/src/modules/dart.rs +++ b/src/modules/dart.rs @@ -4,26 +4,21 @@ use crate::configs::dart::DartConfig; use crate::formatter::StringFormatter; /// Creates a module with the current Dart version -/// -/// Will display the Dart version if any of the following criteria are met: -/// - Current directory contains a file with `.dart` extension -/// - Current directory contains a `.dart_tool` directory -/// - Current directory contains a `pubspec.yaml`/`pubspec.yml` or `pubspec.lock` file pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> { + let mut module = context.new_module("dart"); + let config: DartConfig = DartConfig::try_load(module.config); + let is_dart_project = context .try_begin_scan()? - .set_extensions(&["dart"]) - .set_folders(&[".dart_tool"]) - .set_files(&["pubspec.yaml", "pubspec.yml", "pubspec.lock"]) + .set_files(&config.detect_files) + .set_extensions(&config.detect_extensions) + .set_folders(&config.detect_folders) .is_match(); if !is_dart_project { return None; } - let mut module = context.new_module("dart"); - let config: DartConfig = DartConfig::try_load(module.config); - let parsed = StringFormatter::new(config.format).and_then(|formatter| { formatter .map_meta(|var, _| match var { |