mirror of
https://github.com/sharkdp/bat.git
synced 2024-11-08 00:44:30 +01:00
Merge branch 'master' into fix-1438-newline-can-be-added-even-if-style-plain
This commit is contained in:
commit
73c16574e6
@ -6,6 +6,8 @@
|
||||
## Bugfixes
|
||||
|
||||
- If the last line doesn't end with a newline character, don't add it if `--style=plain`, see #1438 (@Enselic)
|
||||
- Only print themes hint in interactive mode (`bat --list-themes`), see #1439 (@rsteube)
|
||||
- Make ./tests/syntax-tests/regression_test.sh work on recent versions of macOS, see #1443 (@Enselic)
|
||||
|
||||
## Other
|
||||
|
||||
|
@ -200,19 +200,19 @@ pub fn list_themes(cfg: &Config) -> Result<()> {
|
||||
.ok();
|
||||
writeln!(stdout)?;
|
||||
}
|
||||
writeln!(
|
||||
stdout,
|
||||
"Further themes can be installed to '{}', \
|
||||
and are added to the cache with `bat cache --build`. \
|
||||
For more information, see:\n\n \
|
||||
https://github.com/sharkdp/bat#adding-new-themes",
|
||||
config_file().join("themes").to_string_lossy()
|
||||
)?;
|
||||
} else {
|
||||
for theme in assets.themes() {
|
||||
writeln!(stdout, "{}", theme)?;
|
||||
}
|
||||
}
|
||||
writeln!(
|
||||
stdout,
|
||||
"Further themes can be installed to '{}', \
|
||||
and are added to the cache with `bat cache --build`. \
|
||||
For more information, see:\n\n \
|
||||
https://github.com/sharkdp/bat#adding-new-themes",
|
||||
config_file().join("themes").to_string_lossy()
|
||||
)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
2
tests/syntax-tests/regression_test.sh
vendored
2
tests/syntax-tests/regression_test.sh
vendored
@ -4,7 +4,7 @@ set -eou pipefail
|
||||
|
||||
script_directory="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
|
||||
output_directory=$(mktemp -d --suffix=.bat-syntax-regression-test)
|
||||
output_directory=$(mktemp -d)
|
||||
|
||||
"$script_directory"/create_highlighted_versions.py --output="$output_directory"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user