Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-11-24 21:57:41 +00:00
Code Issues Releases Activity

perf(java): Lazy eval java (#2168)

Browse Source 
* perf(java): evaluate version lazily

* fix(java): update format string

* fix: use suggested format string

Co-authored-by: Moritz Vetter <mv@3yourmind.com>
This commit is contained in:
Moritz Vetter 2021-01-20 18:51:30 +01:00 committed by GitHub
parent b065758b1c
commit 83e0432a75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/config/README.md
View File

@ -1335,8 +1335,8 @@ The module will be shown if any of the following conditions are met:
### Options ### Options
| Option | Default | Description | | Option | Default | Description |
| ---------- | -------------------------------------- | ----------------------------------------------- | | ---------- | ---------------------------------------- | ----------------------------------------------- |
| `format` | `"via [${symbol}${version}]($style) "` | The format for the module. | | `format` | `"via [${symbol}(${version} )]($style)"` | The format for the module. |
| `symbol` | `"☕ "` | A format string representing the symbol of Java | | `symbol` | `"☕ "` | A format string representing the symbol of Java |
| `style` | `"red dimmed"` | The style for the module. | | `style` | `"red dimmed"` | The style for the module. |
| `disabled` | `false` | Disables the `java` module. | | `disabled` | `false` | Disables the `java` module. |

2
src/configs/java.rs
View File

@ -13,7 +13,7 @@ pub struct JavaConfig<'a> {
impl<'a> RootModuleConfig<'a> for JavaConfig<'a> { impl<'a> RootModuleConfig<'a> for JavaConfig<'a> {
fn new() -> Self { fn new() -> Self {
JavaConfig { JavaConfig {
format: "via [$symbol$version]($style) ", format: "via [$symbol($version )]($style)",
disabled: false, disabled: false,
style: "red dimmed", style: "red dimmed",
symbol: "☕ ", symbol: "☕ ",

23
src/modules/java.rs
View File

@ -32,8 +32,6 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
return None; return None;
} }
let java_version = get_java_version(context)?;
let mut module = context.new_module("java"); let mut module = context.new_module("java");
let config: JavaConfig = JavaConfig::try_load(module.config); let config: JavaConfig = JavaConfig::try_load(module.config);
@ -48,7 +46,10 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
_ => None, _ => None,
}) })
.map(|variable| match variable { .map(|variable| match variable {
"version" => Some(Ok(&java_version)), "version" => {
let java_version = get_java_version(context)?;
Some(Ok(java_version))
}
_ => None, _ => None,
}) })
.parse(None) .parse(None)
@ -175,7 +176,7 @@ mod tests {
let dir = tempfile::tempdir()?; let dir = tempfile::tempdir()?;
File::create(dir.path().join("Main.java"))?.sync_all()?; File::create(dir.path().join("Main.java"))?.sync_all()?;
let actual = ModuleRenderer::new("java").path(dir.path()).collect(); let actual = ModuleRenderer::new("java").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Red.dimmed().paint("☕ v13.0.2"))); let expected = Some(format!("via {}", Color::Red.dimmed().paint("☕ v13.0.2 ")));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
} }
@ -185,7 +186,7 @@ mod tests {
let dir = tempfile::tempdir()?; let dir = tempfile::tempdir()?;
File::create(dir.path().join("Main.class"))?.sync_all()?; File::create(dir.path().join("Main.class"))?.sync_all()?;
let actual = ModuleRenderer::new("java").path(dir.path()).collect(); let actual = ModuleRenderer::new("java").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Red.dimmed().paint("☕ v13.0.2"))); let expected = Some(format!("via {}", Color::Red.dimmed().paint("☕ v13.0.2 ")));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
} }
@ -195,7 +196,7 @@ mod tests {
let dir = tempfile::tempdir()?; let dir = tempfile::tempdir()?;
File::create(dir.path().join("build.gradle"))?.sync_all()?; File::create(dir.path().join("build.gradle"))?.sync_all()?;
let actual = ModuleRenderer::new("java").path(dir.path()).collect(); let actual = ModuleRenderer::new("java").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Red.dimmed().paint("☕ v13.0.2"))); let expected = Some(format!("via {}", Color::Red.dimmed().paint("☕ v13.0.2 ")));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
} }
@ -205,7 +206,7 @@ mod tests {
let dir = tempfile::tempdir()?; let dir = tempfile::tempdir()?;
File::create(dir.path().join("test.jar"))?.sync_all()?; File::create(dir.path().join("test.jar"))?.sync_all()?;
let actual = ModuleRenderer::new("java").path(dir.path()).collect(); let actual = ModuleRenderer::new("java").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Red.dimmed().paint("☕ v13.0.2"))); let expected = Some(format!("via {}", Color::Red.dimmed().paint("☕ v13.0.2 ")));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
} }
@ -215,7 +216,7 @@ mod tests {
let dir = tempfile::tempdir()?; let dir = tempfile::tempdir()?;
File::create(dir.path().join("pom.xml"))?.sync_all()?; File::create(dir.path().join("pom.xml"))?.sync_all()?;
let actual = ModuleRenderer::new("java").path(dir.path()).collect(); let actual = ModuleRenderer::new("java").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Red.dimmed().paint("☕ v13.0.2"))); let expected = Some(format!("via {}", Color::Red.dimmed().paint("☕ v13.0.2 ")));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
} }
@ -225,7 +226,7 @@ mod tests {
let dir = tempfile::tempdir()?; let dir = tempfile::tempdir()?;
File::create(dir.path().join("build.gradle.kts"))?.sync_all()?; File::create(dir.path().join("build.gradle.kts"))?.sync_all()?;
let actual = ModuleRenderer::new("java").path(dir.path()).collect(); let actual = ModuleRenderer::new("java").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Red.dimmed().paint("☕ v13.0.2"))); let expected = Some(format!("via {}", Color::Red.dimmed().paint("☕ v13.0.2 ")));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
} }
@ -235,7 +236,7 @@ mod tests {
let dir = tempfile::tempdir()?; let dir = tempfile::tempdir()?;
File::create(dir.path().join("build.gradle.kts"))?.sync_all()?; File::create(dir.path().join("build.gradle.kts"))?.sync_all()?;
let actual = ModuleRenderer::new("java").path(dir.path()).collect(); let actual = ModuleRenderer::new("java").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Red.dimmed().paint("☕ v13.0.2"))); let expected = Some(format!("via {}", Color::Red.dimmed().paint("☕ v13.0.2 ")));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
} }
@ -245,7 +246,7 @@ mod tests {
let dir = tempfile::tempdir()?; let dir = tempfile::tempdir()?;
File::create(dir.path().join(".java-version"))?.sync_all()?; File::create(dir.path().join(".java-version"))?.sync_all()?;
let actual = ModuleRenderer::new("java").path(dir.path()).collect(); let actual = ModuleRenderer::new("java").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Red.dimmed().paint("☕ v13.0.2"))); let expected = Some(format!("via {}", Color::Red.dimmed().paint("☕ v13.0.2 ")));
assert_eq!(expected, actual); assert_eq!(expected, actual);
dir.close() dir.close()
} }