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

perf(kotlin): Lazy eval kotlin (#2186) 

* perf(kotlin): evaluate version lazily

* fix(kotlin): update format string; update tests

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

14
docs/config/README.md
View File

@ -1443,13 +1443,13 @@ The module will be shown if any of the following conditions are met:
### Options
| Option | Default | Description |
| --------------- | ---------------------------------- | ----------------------------------------------------------------------------- |
| `format` | `"via [$symbol$version]($style) "` | The format for the module. |
| `symbol` | `"🅺 "` | A format string representing the symbol of Kotlin. |
| `style` | `"bold blue"` | The style for the module. |
| `kotlin_binary` | `"kotlin"` | Configures the kotlin binary that Starship executes when getting the version. |
| `disabled` | `false` | Disables the `kotlin` module. |
| Option | Default | Description |
| --------------- | ------------------------------------ | ----------------------------------------------------------------------------- |
| `format` | `"via [$symbol($version )]($style)"` | The format for the module. |
| `symbol` | `"🅺 "` | A format string representing the symbol of Kotlin. |
| `style` | `"bold blue"` | The style for the module. |
| `kotlin_binary` | `"kotlin"` | Configures the kotlin binary that Starship executes when getting the version. |
| `disabled` | `false` | Disables the `kotlin` module. |
### Variables

2
src/configs/kotlin.rs
View File

@ -14,7 +14,7 @@ pub struct KotlinConfig<'a> {
impl<'a> RootModuleConfig<'a> for KotlinConfig<'a> {
fn new() -> Self {
KotlinConfig {
format: "via [$symbol$version]($style) ",
format: "via [$symbol($version )]($style)",
symbol: "🅺 ",
style: "bold blue",
kotlin_binary: "kotlin",

15
src/modules/kotlin.rs
View File

@ -23,7 +23,6 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let mut module = context.new_module("kotlin");
let config = KotlinConfig::try_load(module.config);
let kotlin_version = format_kotlin_version(&get_kotlin_version(&config.kotlin_binary)?)?;
let parsed = StringFormatter::new(config.format).and_then(|formatter| {
formatter
.map_meta(|var, _| match var {
@ -35,7 +34,11 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
_ => None,
})
.map(|variable| match variable {
"version" => Some(Ok(&kotlin_version)),
"version" => {
let kotlin_version =
format_kotlin_version(&get_kotlin_version(&config.kotlin_binary)?)?;
Some(Ok(kotlin_version))
}
_ => None,
})
.parse(None)
@ -99,7 +102,7 @@ mod tests {
let dir = tempfile::tempdir()?;
File::create(dir.path().join("main.kt"))?.sync_all()?;
let actual = ModuleRenderer::new("kotlin").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Blue.bold().paint("🅺 v1.4.21")));
let expected = Some(format!("via {}", Color::Blue.bold().paint("🅺 v1.4.21 ")));
assert_eq!(expected, actual);
dir.close()
}
@ -109,7 +112,7 @@ mod tests {
let dir = tempfile::tempdir()?;
File::create(dir.path().join("main.kts"))?.sync_all()?;
let actual = ModuleRenderer::new("kotlin").path(dir.path()).collect();
let expected = Some(format!("via {} ", Color::Blue.bold().paint("🅺 v1.4.21")));
let expected = Some(format!("via {}", Color::Blue.bold().paint("🅺 v1.4.21 ")));
assert_eq!(expected, actual);
dir.close()
}
@ -129,7 +132,7 @@ mod tests {
.config(config)
.collect();
let expected = Some(format!("via {} ", Color::Blue.bold().paint("🅺 v1.4.21")));
let expected = Some(format!("via {}", Color::Blue.bold().paint("🅺 v1.4.21 ")));
assert_eq!(expected, actual);
dir.close()
}
@ -149,7 +152,7 @@ mod tests {
.config(config)
.collect();
let expected = Some(format!("via {} ", Color::Blue.bold().paint("🅺 v1.4.21")));
let expected = Some(format!("via {}", Color::Blue.bold().paint("🅺 v1.4.21 ")));
assert_eq!(expected, actual);
dir.close()
}