holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make hints aware of the current directory (#10780)

Browse Source 
This commit uses the new `CwdAwareHinter` in reedline. Closes #8883.

# Description

Currently, the history based hints show results from all directories,
while most commands make sense only in the directory they were run in.
This PR makes hints take the current directory into account.

# User-Facing Changes

Described above.

I haven't yet added a config option for this, because I personally
believe folks won't be against it once they try it out. We can add it if
people complain, there's some time before the next release.

Fish has this without a config option too.

# Tests + Formatting

If tests are needed, I'll need help as I'm not well versed with the
codebase.
This commit is contained in:
Chinmay Dalal 2023-10-20 14:51:58 +05:30 committed by GitHub
parent d0dc6986dd
commit f310a9be8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.lock generated
View File

@ -4249,8 +4249,7 @@ dependencies = [
[[package]] [[package]]
name = "reedline" name = "reedline"
version = "0.25.0" version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/nushell/reedline.git?branch=main#973dbb5f5f2338c18c25ce951bfa42c8d8cacfdf"
checksum = "e7dc1d1d369c194cf79acc204397aca1fecc4248df3e1c1eabb15e5ef2d16991"
dependencies = [ dependencies = [
"chrono", "chrono",
"crossterm 0.27.0", "crossterm 0.27.0",

2
Cargo.toml
View File

@ -164,7 +164,7 @@ bench = false
# To use a development version of a dependency please use a global override here # To use a development version of a dependency please use a global override here
# changing versions in each sub-crate of the workspace is tedious # changing versions in each sub-crate of the workspace is tedious
[patch.crates-io] [patch.crates-io]
# reedline = { git = "https://github.com/nushell/reedline.git", branch = "main" } reedline = { git = "https://github.com/nushell/reedline.git", branch = "main" }
# nu-ansi-term = {git = "https://github.com/nushell/nu-ansi-term.git", branch = "main"} # nu-ansi-term = {git = "https://github.com/nushell/nu-ansi-term.git", branch = "main"}
# uu_cp = { git = "https://github.com/uutils/coreutils.git", branch = "main" } # uu_cp = { git = "https://github.com/uutils/coreutils.git", branch = "main" }

6
crates/nu-cli/src/repl.rs
View File

@ -22,8 +22,8 @@ use nu_protocol::{
}; };
use nu_utils::utils::perf; use nu_utils::utils::perf;
use reedline::{ use reedline::{
CursorConfig, DefaultHinter, EditCommand, Emacs, FileBackedHistory, HistorySessionId, Reedline, CursorConfig, CwdAwareHinter, EditCommand, Emacs, FileBackedHistory, HistorySessionId,
SqliteBackedHistory, Vi, Reedline, SqliteBackedHistory, Vi,
}; };
use std::{ use std::{
env::temp_dir, env::temp_dir,
@ -302,7 +302,7 @@ pub fn evaluate_repl(
line_editor.with_hinter(Box::new({ line_editor.with_hinter(Box::new({
// As of Nov 2022, "hints" color_config closures only get `null` passed in. // As of Nov 2022, "hints" color_config closures only get `null` passed in.
let style = style_computer.compute("hints", &Value::nothing(Span::unknown())); let style = style_computer.compute("hints", &Value::nothing(Span::unknown()));
DefaultHinter::default().with_style(style) CwdAwareHinter::default().with_style(style)
})) }))
} else { } else {
line_editor.disable_hints() line_editor.disable_hints()