Rename `--squeeze` to `--squeeze-blank`

pull/2665/head
einfachIrgendwer0815 2 months ago
parent f041ff8c5f
commit 83b00bc653
No known key found for this signature in database
GPG Key ID: 58D55E5F117DA873

@ -116,7 +116,7 @@ Options:
--list-themes
Display a list of supported themes for syntax highlighting.
-s, --squeeze
-s, --squeeze-blank
Squeeze consecutive empty lines into a single empty line.
--squeeze-limit <squeeze-limit>

@ -43,7 +43,7 @@ Options:
Set the color theme for syntax highlighting.
--list-themes
Display all supported highlighting themes.
-s, --squeeze
-s, --squeeze-blank
Squeeze consecutive empty lines.
--style <components>
Comma-separated list of style elements to display (*default*, auto, full, plain, changes,

@ -290,7 +290,7 @@ impl App {
#[cfg(feature = "lessopen")]
use_lessopen: self.matches.get_flag("lessopen"),
set_terminal_title: self.matches.get_flag("set-terminal-title"),
squeeze_lines: if self.matches.get_flag("squeeze") {
squeeze_lines: if self.matches.get_flag("squeeze-blank") {
Some(
self.matches
.get_one::<usize>("squeeze-limit")

@ -388,8 +388,8 @@ pub fn build_app(interactive_output: bool) -> Command {
.long_help("Display a list of supported themes for syntax highlighting."),
)
.arg(
Arg::new("squeeze")
.long("squeeze")
Arg::new("squeeze-blank")
.long("squeeze-blank")
.short('s')
.action(ArgAction::SetTrue)
.help("Squeeze consecutive empty lines.")

@ -209,20 +209,20 @@ fn line_range_multiple() {
}
#[test]
fn squeeze() {
fn squeeze_blank() {
bat()
.arg("empty_lines.txt")
.arg("--squeeze")
.arg("--squeeze-blank")
.assert()
.success()
.stdout("line 1\n\nline 5\n\nline 20\nline 21\n\nline 24\n\nline 26\n\nline 30\n");
}
#[test]
fn squeeze_line_numbers() {
fn squeeze_blank_line_numbers() {
bat()
.arg("empty_lines.txt")
.arg("--squeeze")
.arg("--squeeze-blank")
.arg("--decorations=always")
.arg("--number")
.assert()
@ -234,7 +234,7 @@ fn squeeze_line_numbers() {
fn squeeze_limit() {
bat()
.arg("empty_lines.txt")
.arg("--squeeze")
.arg("--squeeze-blank")
.arg("--squeeze-limit=2")
.assert()
.success()
@ -242,7 +242,7 @@ fn squeeze_limit() {
bat()
.arg("empty_lines.txt")
.arg("--squeeze")
.arg("--squeeze-blank")
.arg("--squeeze-limit=5")
.assert()
.success()
@ -253,7 +253,7 @@ fn squeeze_limit() {
fn squeeze_limit_line_numbers() {
bat()
.arg("empty_lines.txt")
.arg("--squeeze")
.arg("--squeeze-blank")
.arg("--squeeze-limit=2")
.arg("--decorations=always")
.arg("--number")
@ -263,7 +263,7 @@ fn squeeze_limit_line_numbers() {
bat()
.arg("empty_lines.txt")
.arg("--squeeze")
.arg("--squeeze-blank")
.arg("--squeeze-limit=5")
.arg("--decorations=always")
.arg("--number")

Loading…
Cancel
Save