extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2024-12-16 04:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into conditional-style

Browse Source
This commit is contained in:
Filip Bachul 2022-10-03 00:41:42 +02:00
commit 2688af4d1b
7 changed files with 54 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Cargo.lock generated
View File

@ -323,36 +323,35 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "3.2.22" version = "4.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" checksum = "7f78ad8e84aa8e8aa3e821857be40eb4b925ff232de430d4dd2ae6aa058cbd92"
dependencies = [ dependencies = [
"atty", "atty",
"bitflags", "bitflags",
"clap_derive", "clap_derive",
"clap_lex", "clap_lex",
"indexmap",
"once_cell", "once_cell",
"strsim", "strsim",
"termcolor", "termcolor",
"textwrap",
"unicase", "unicase",
"unicode-width",
] ]
[[package]] [[package]]
name = "clap_complete" name = "clap_complete"
version = "3.2.5" version = "4.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" checksum = "11cba7abac9b56dfe2f035098cdb3a43946f276e6db83b72c4e692343f9aab9a"
dependencies = [ dependencies = [
"clap", "clap",
] ]
[[package]] [[package]]
name = "clap_derive" name = "clap_derive"
version = "3.2.18" version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" checksum = "ca689d7434ce44517a12a89456b2be4d1ea1cafcd8f581978c03d45f5a5c12a7"
dependencies = [ dependencies = [
"heck 0.4.0", "heck 0.4.0",
"proc-macro-error", "proc-macro-error",
@ -363,9 +362,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_lex" name = "clap_lex"
version = "0.2.4" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
dependencies = [ dependencies = [
"os_str_bytes", "os_str_bytes",
] ]
@ -2997,15 +2996,6 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "textwrap"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
dependencies = [
"unicode-width",
]
[[package]] [[package]]
name = "thiserror" name = "thiserror"
version = "1.0.35" version = "1.0.35"

6
Cargo.toml
View File

@ -23,7 +23,7 @@ license = "ISC"
readme = "README.md" readme = "README.md"
repository = "https://github.com/starship/starship" repository = "https://github.com/starship/starship"
# Note: MSRV is only intended as a hint, and only the latest version is officially supported in starship. # Note: MSRV is only intended as a hint, and only the latest version is officially supported in starship.
rust-version = "1.59" rust-version = "1.60"
description = """ description = """
The minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️ The minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️
""" """
@ -36,8 +36,8 @@ notify = ["notify-rust"]
[dependencies] [dependencies]
chrono = { version = "0.4.22", features = ["clock", "std"] } chrono = { version = "0.4.22", features = ["clock", "std"] }
clap = { version = "=3.2.22", features = ["derive", "cargo", "unicode", "unstable-v4"] } clap = { version = "4.0.4", features = ["derive", "cargo", "unicode"] }
clap_complete = "3.2.5" clap_complete = "4.0.2"
dirs-next = "2.0.0" dirs-next = "2.0.0"
dunce = "1.0.2" dunce = "1.0.2"
gethostname = "0.2.3" gethostname = "0.2.3"

1
README.md
View File

@ -220,7 +220,6 @@ Alternatively, install Starship using any of the following package managers:
| Arch Linux | [Arch Linux Community] | `pacman -S starship` | | Arch Linux | [Arch Linux Community] | `pacman -S starship` |
| CentOS 7+ | [Copr] | `dnf copr enable atim/starship` <br /> `dnf install starship` | | CentOS 7+ | [Copr] | `dnf copr enable atim/starship` <br /> `dnf install starship` |
| Fedora 31+ | [Fedora Packages] | `dnf install starship` | | Fedora 31+ | [Fedora Packages] | `dnf install starship` |
| NixOS | [nixpkgs] | `nix-env -iA nixos.starship` |
| Gentoo | [Gentoo Packages] | `emerge app-shells/starship` | | Gentoo | [Gentoo Packages] | `emerge app-shells/starship` |
| Manjaro | | `pacman -S starship` | | Manjaro | | `pacman -S starship` |
| NixOS | [nixpkgs] | `nix-env -iA nixpkgs.starship` | | NixOS | [nixpkgs] | `nix-env -iA nixpkgs.starship` |

22
docs/config/README.md
View File

@ -1952,21 +1952,21 @@ disabled = false
The `java` module shows the currently installed version of [Java](https://www.oracle.com/java/). The `java` module shows the currently installed version of [Java](https://www.oracle.com/java/).
By default the module will be shown if any of the following conditions are met: By default the module will be shown if any of the following conditions are met:
- The current directory contains a `pom.xml`, `build.gradle.kts`, `build.sbt`, `.java-version`, `.deps.edn`, `project.clj`, or `build.boot` file - The current directory contains a `pom.xml`, `build.gradle.kts`, `build.sbt`, `.java-version`, `deps.edn`, `project.clj`, or `build.boot` file
- The current directory contains a file with the `.java`, `.class`, `.gradle`, `.jar`, `.clj`, or `.cljc` extension - The current directory contains a file with the `.java`, `.class`, `.gradle`, `.jar`, `.clj`, or `.cljc` extension
### 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. |
| `version_format` | `"v${raw}"` | The version format. Available vars are `raw`, `major`, `minor`, & `patch` | | `version_format` | `"v${raw}"` | The version format. Available vars are `raw`, `major`, `minor`, & `patch` |
| `detect_extensions` | `["java", "class", "gradle", "jar", "cljs", "cljc"]` | Which extensions should trigger this module. | | `detect_extensions` | `["java", "class", "gradle", "jar", "cljs", "cljc"]` | Which extensions should trigger this module. |
| `detect_files` | `["pom.xml", "build.gradle.kts", "build.sbt", ".java-version", ".deps.edn", "project.clj", "build.boot"]` | Which filenames should trigger this module. | | `detect_files` | `["pom.xml", "build.gradle.kts", "build.sbt", ".java-version", "deps.edn", "project.clj", "build.boot"]` | Which filenames should trigger this module. |
| `detect_folders` | `[]` | Which folders should trigger this modules. | | `detect_folders` | `[]` | Which folders should trigger this modules. |
| `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. |
### Variables ### Variables

4
src/main.rs
View File

@ -5,7 +5,7 @@ use std::io;
use std::thread::available_parallelism; use std::thread::available_parallelism;
use std::time::SystemTime; use std::time::SystemTime;
use clap::{IntoApp, Parser, Subcommand}; use clap::{CommandFactory, Parser, Subcommand};
use clap_complete::{generate, Shell as CompletionShell}; use clap_complete::{generate, Shell as CompletionShell};
use rand::distributions::Alphanumeric; use rand::distributions::Alphanumeric;
use rand::Rng; use rand::Rng;
@ -33,7 +33,7 @@ enum Commands {
BugReport, BugReport,
/// Generate starship shell completions for your shell to stdout /// Generate starship shell completions for your shell to stdout
Completions { Completions {
#[clap(arg_enum)] #[clap(value_enum)]
shell: CompletionShell, shell: CompletionShell,
}, },
/// Edit the starship configuration /// Edit the starship configuration

28
src/modules/directory.rs
View File

@ -112,7 +112,7 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
|| ((num_segments_after_root - 1) as i64) < config.truncation_length || ((num_segments_after_root - 1) as i64) < config.truncation_length
{ {
let root = repo_path_vec[0]; let root = repo_path_vec[0];
let before = dir_string.replace(&contracted_path, ""); let before = before_root_dir(&dir_string, &contracted_path);
[prefix + before.as_str(), root.to_string(), after_repo_root] [prefix + before.as_str(), root.to_string(), after_repo_root]
} else { } else {
["".to_string(), "".to_string(), prefix + dir_string.as_str()] ["".to_string(), "".to_string(), prefix + dir_string.as_str()]
@ -341,6 +341,14 @@ fn convert_path_sep(path: &str) -> String {
return PathBuf::from_slash(path).to_string_lossy().into_owned(); return PathBuf::from_slash(path).to_string_lossy().into_owned();
} }
/// Get the path before the git repo root by trim the most right repo name.
fn before_root_dir(path: &str, repo: &str) -> String {
match path.rsplit_once(repo) {
Some((a, _)) => a.to_string(),
None => path.to_string(),
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
@ -1790,4 +1798,22 @@ mod tests {
assert_eq!(expected, actual); assert_eq!(expected, actual);
tmp_dir.close() tmp_dir.close()
} }
#[test]
fn parent_and_sub_git_repo_are_in_same_name_folder() {
assert_eq!(
before_root_dir("~/user/gitrepo/gitrepo", "gitrepo"),
"~/user/gitrepo/".to_string()
);
assert_eq!(
before_root_dir("~/user/gitrepo-diff/gitrepo", "gitrepo"),
"~/user/gitrepo-diff/".to_string()
);
assert_eq!(
before_root_dir("~/user/gitrepo-diff/gitrepo", "aaa"),
"~/user/gitrepo-diff/gitrepo".to_string()
);
}
} }

4
src/print.rs
View File

@ -1,4 +1,4 @@
use clap::{PossibleValue, ValueEnum}; use clap::{builder::PossibleValue, ValueEnum};
use nu_ansi_term::AnsiStrings; use nu_ansi_term::AnsiStrings;
use rayon::prelude::*; use rayon::prelude::*;
use std::collections::BTreeSet; use std::collections::BTreeSet;
@ -460,7 +460,7 @@ impl ValueEnum for Preset {
shadow::get_preset_list() shadow::get_preset_list()
} }
fn to_possible_value<'a>(&self) -> Option<clap::PossibleValue<'a>> { fn to_possible_value(&self) -> Option<PossibleValue> {
Some(PossibleValue::new(self.0)) Some(PossibleValue::new(self.0))
} }
} }