nushell/reedline
1
1
Fork 0
mirror of https://github.com/nushell/reedline.git synced 2024-10-27 01:45:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

CwdAwareHinter: remove cwd filter when there are no results (#656)

Browse Source 
* CwdAwareHinter: remove cwd filter when there are no results

* remove panicking functions
This commit is contained in:
Chinmay Dalal 2023-11-13 18:29:42 +05:30 committed by GitHub
parent 01e32dae88
commit d9e0a326df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/hinter/cwd_aware.rs
View File

@ -24,7 +24,7 @@ impl Hinter for CwdAwareHinter {
use_ansi_coloring: bool,
) -> String {
self.current_hint = if line.chars().count() >= self.min_chars {
history
let with_cwd = history
.search(SearchQuery::last_with_prefix_and_cwd(
line.to_string(),
history.session(),
@ -39,15 +39,29 @@ impl Hinter for CwdAwareHinter {
Err(err)
}
})
.expect("todo: error handling")
.get(0)
.map_or_else(String::new, |entry| {
entry
.command_line
.get(line.len()..)
.unwrap_or_default()
.to_string()
})
.unwrap_or_default();
if !with_cwd.is_empty() {
with_cwd[0]
.command_line
.get(line.len()..)
.unwrap_or_default()
.to_string()
} else {
history
.search(SearchQuery::last_with_prefix(
line.to_string(),
history.session(),
))
.unwrap_or_default()
.get(0)
.map_or_else(String::new, |entry| {
entry
.command_line
.get(line.len()..)
.unwrap_or_default()
.to_string()
})
}
} else {
String::new()
};