Skip to content

add cwd aware hinter #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sholderbach merged 7 commits into from
Oct 19, 2023
Merged

add cwd aware hinter #647

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ce7488
add cwd aware hinter
p00f Oct 17, 2023
3e02a1e
handle the case where get_current_dir returns Err
p00f Oct 17, 2023
51f05e6
WIP cwd aware hinter
p00f Oct 17, 2023
00c59e4
document that CwdAwareHinter is only compatible with sqlite history
p00f Oct 19, 2023
05b9d5e
handle non-sqlite history
p00f Oct 19, 2023
c9766b1
handle no sqlite feature in example
p00f Oct 19, 2023
94fa7d6
fix warnings
p00f Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
handle the case where get_current_dir returns Err
  • Loading branch information
@p00f
p00f committed Oct 17, 2023
commit 3e02a1e0dc769732b016caeb0c34c31cc5a0f97a
21 changes: 13 additions & 8 deletions src/history/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,19 @@ impl SearchQuery {
prefix: String,
session: Option<HistorySessionId>,
) -> SearchQuery {
SearchQuery::last_with_search(SearchFilter::from_text_search_cwd(
std::env::current_dir()
.unwrap()
.to_string_lossy()
.to_string(),
CommandLineSearch::Prefix(prefix),
session,
))
let cwd = std::env::current_dir();
if let Ok(cwd) = cwd {
SearchQuery::last_with_search(SearchFilter::from_text_search_cwd(
cwd.to_string_lossy().to_string(),
CommandLineSearch::Prefix(prefix),
session,
))
} else {
SearchQuery::last_with_search(SearchFilter::from_text_search(
CommandLineSearch::Prefix(prefix),
session,
))
}
}

/// Query to get all entries in the given [`SearchDirection`]
Expand Down