Skip to content
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

Jump to bottom

Add support for max_preview_height setting #1088

Merged
merged 2 commits into from
Jul 31, 2023
Merged

Add support for max_preview_height setting #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2077a6
Add support for `max_preview_height` setting
RichardDRJ Jul 6, 2023
514ffa5
[PR] Run `cargo fmt`
RichardDRJ Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions atuin-client/src/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ pub struct Settings {
pub inline_height: u16,
pub invert: bool,
pub show_preview: bool,
pub max_preview_height: u16,
pub show_help: bool,
pub exit_mode: ExitMode,
pub word_jump_mode: WordJumpMode,
Expand Down Expand Up @@ -358,6 +359,7 @@ impl Settings {
.set_default("style", "auto")?
.set_default("inline_height", 0)?
.set_default("show_preview", false)?
.set_default("max_preview_height", 4)?
.set_default("show_help", true)?
.set_default("invert", false)?
.set_default("exit_mode", "return-original")?
Expand Down
26 changes: 17 additions & 9 deletions atuin/src/command/client/search/interactive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,14 @@ impl State {
.max_by(|h1, h2| h1.command.len().cmp(&h2.command.len()));
longest_command.map_or(0, |v| {
std::cmp::min(
4,
(v.command.len() as u16 + preview_width - 1 - border_size)
/ (preview_width - border_size),
settings.max_preview_height,
v.command
.split('\n')
.map(|line| {
(line.len() as u16 + preview_width - 1 - border_size)
/ (preview_width - border_size)
})
.sum(),
)
}) + border_size * 2
} else if compact {
Expand Down Expand Up @@ -473,12 +478,15 @@ impl State {
} else {
use itertools::Itertools as _;
let s = &results[selected].command;
s.char_indices()
.step_by(preview_width.into())
.map(|(i, _)| i)
.chain(Some(s.len()))
.tuple_windows()
.map(|(a, b)| &s[a..b])
s.split('\n')
.flat_map(|line| {
line.char_indices()
.step_by(preview_width.into())
.map(|(i, _)| i)
.chain(Some(line.len()))
.tuple_windows()
.map(|(a, b)| &line[a..b])
})
.join("\n")
};
let preview = if compact {
Expand Down
8 changes: 8 additions & 0 deletions docs/docs/config/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,14 @@ Configure whether or not to show a preview of the selected command.

Useful when the command is longer than the terminal width and is cut off.

### `max_preview_height`

Configure the maximum height of the preview to show.

Useful when you have long scripts in your history that you want to distinguish by more than the first few lines.

Defaults to `4`.

### `show_help`

Configure whether or not to show the help row, which includes the current Atuin version (and whether an update is available), a keymap hint, and the total amount of commands in your history.
Expand Down