MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2026-02-08 08:42:08 +00:00
Code Issues Releases Wiki Activity
3,674 Commits 12 Branches 43 Tags
2e355ffa4e732149b80a108748a35f8ac19519ab
Commit Graph

154 Commits

Author SHA1 Message Date
Yuri Astrakhan
503c50b1ec chore: address all cargo clippy lints 
* also do a bit of a doc cleanup for the `load_from_folder` fn
 2025-08-19 05:22:47 +02:00
Yuri Astrakhan
d9fbd18541 inline format arguments 
In a few cases, removed the unneeded `&` - this causes a minor slowdown because compiler cannot eliminate those (yet).
 2025-08-19 05:07:54 +02:00
Keith Hall
8b12191bda Make map-syntax target case insensitive 2025-07-17 22:19:54 +03:00
krikera
17e6952ab8 Fix UTF-8 BOM file type detection for first-line syntax patterns - Fixes #3314 2025-05-31 02:58:47 +05:30
einfachIrgendwer0815
52252b15d6 Fix clippy::needless_lifetimes warnings 2025-02-02 15:08:15 +01:00
Tau Gärtli
abf9dada04 Remove HighlightingAssets::default_theme() 2024-08-16 14:13:58 +02:00
Tau Gärtli
cda363a3f7 Use default_theme() function from theme module 2024-08-16 14:09:38 +02:00
Tau Gärtli
de796392cf Deprecate old default_theme function 2024-08-16 14:09:38 +02:00
Lena
4c85483486 Inline format! args wherever possible 2024-02-25 00:38:11 +01:00
cyqsimon
cfd622d6e1 Migrate SyntaxMapping impl to new system 
Most existing builtins are removed but not yet ported, so the test
`user_can_override_builtin_mappings` should fail. It should pass once the old
rules have been ported.
 2023-12-11 10:21:05 +08:00
Utkarsh Gupta
a721cc31f3 Replace dirs crate with etcetera crate 2023-09-01 21:13:21 +02:00
Constantin Nickel
0e148e35dd Replace dirs-next with the original dirs crate 
The `dirs` crate was forked as `dirs-next` after the original repos were archived.
The fork hasn't released a new version since October 2020, while the original
has been taken off the shelf and has seen updates since then.
 2023-03-24 19:10:38 +01:00
BlackHoleFox
1004018941 Directly read preferences instead of using the defaults CLI 2023-02-05 16:53:28 +01:00
rhysd
5e3abcad07 Fix code fence in doc comment 2023-01-13 08:16:38 +01:00
Martin Nordholts
3339eee2dc Make the default macOS theme depend on Dark Mode (#2197) 
* Make the default macOS theme depend on Dark Mode

We frequently get complaints from macOS users that bat does not work on
their default macOS terminal background, which is white.

Pay the price of slightly increased startup time to get a better default
on macOS. To avoid the slightly increased startup time, simply specify a
theme explicitly via `--theme`, `BAT_THEME`, or `~/.config/bat`.

Note that if there is an error when we check if Dark Mode is enabled, we
behave the same as on Windows and Linux; assume that the terminal
background is dark. This harmonizes behavior across platforms, and makes
bat behave the same as before, when Dark Mode was always assumed to be
enabled.

* src/assets.rs: Fix typo

* Update CHANGELOG.md
 2022-05-24 19:29:03 +02:00
Martin Nordholts
7334ab4542 Bump to syntect 5.0.0 to e.g. start lazy-loading syntaxes (#2181) 
* Bump to syntect 5.0.0 to e.g. start lazy-loading themes

Closes #915
Closes #951
Closes #1846
Closes #1854

* Typo fix formated -> formatted

* Update CHANGELOG.md
 2022-05-07 13:43:11 +02:00
Dan Davison
4e36a56014 Expose syntect theme and syntax sets (#2030) 
Fixes #2026
Ref https://github.com/dandavison/delta/issues/895
 2022-02-08 08:00:12 +01:00
Martin Nordholts
a3ea798246 Credit syntax definition and theme authors with new --acknowledgements option (#1971) 
The text that is printed is generated when building assets, by analyzing LICENSE
and NOTICE files that comes with syntaxes and themes.

We take this opportunity to also add a NOTICE file as defined by Apache License 2.0.
 2021-12-11 14:00:45 +01:00
Martin Nordholts
e250da8aaa Run cargo clippy --fix --all-targets --all-features with Rust 1.57 
Clippy in the newly released Rust 1.57 found some new lints. Conveniently, all
of them were fixable with `--fix`.
 2021-12-08 08:45:04 +01:00
Martin Nordholts
7fceb4878f Load themes lazily for improved startup time (#1969) 
This is for #951. Syntax lazy-loading will come later and have a much bigger
impact, but lazy-loading of themes does not have negligible impact.
 2021-12-06 09:14:15 +01:00
Martin Nordholts
dd0925a946 Replace lazycell with once_cell 
We started to use lazycell because syntect already used it. But syntect has
changed to use once_cell. So we should also do that to prepare for using the
upcoming version of syntect.
 2021-11-22 22:03:03 +01:00
Martin Nordholts
d7671fa8e3 Remove the code related to minimal_syntaxes.bin 
To get fast startup, syntect will instead start to lazy-load syntaxes. See
https://github.com/trishume/syntect/pull/393 and discussions in linked PRs.
 2021-11-22 20:42:01 +01:00
Martin Nordholts
e79b07bf5e HighlightingAssets::get_syntax_set(): Make private 
Was forgotten in aefc8fd824.
 2021-11-22 20:42:01 +01:00
Bojan Đurđević
d6ed5e6746 Support for ignored-suffix CLI arguments (#1892) 2021-11-19 17:05:23 +01:00
cbolgiano
7fe4fdf33d Introduce MapExtensionToUnknown MappingTarget (#1889) 
Co-authored-by: Martin Nordholts <enselic@gmail.com>
 2021-10-25 17:59:12 +02:00
Martin Nordholts
aefc8fd824 src/printer.rs: Simplify Plain Text fallback code 
By forwarding the task to find the `Plain Text` syntax to `assets`. Not only does
the code become simpler; we also get rid of a call to `self.get_syntax_set()`
which is beneficial to the long term goal of replacing `syntaxes.bin` with
`minimal_syntaxes.bin`.

Note that the use of `.expect()` is not a regression in error handling. It was
previously hidden in `.find_syntax_plain_text()`.
 2021-09-29 17:54:45 +02:00
Martin Nordholts
405a80f3ee HighlightingAssets: Turn get_syntax_for_path() into public API 2021-09-28 07:26:20 +02:00
Martin Nordholts
ad98d35a48 HighlightingAssets: Implement get_syntax_for_file_name() with get_syntax_for_path() 
We can do this since the file_name() of a file_name is file_name.
 2021-09-28 07:26:20 +02:00
Martin Nordholts
b69ab219d7 HighlightingAssets: Extract get_syntax_for_path() method 
To make the code easier to refactor further.
 2021-09-28 07:26:20 +02:00
Martin Nordholts
dc8225f682 src/assets.rs: Extract helper method OpenedInput::path() 2021-09-27 08:00:58 +02:00
Martin Nordholts
0994f3783f HighlightingAssets: Move common get_extension_syntax() code into find_syntax_by_extension() 2021-09-22 06:03:24 +02:00
Martin Nordholts
974dec38e3 HighlightingAssets: Inline find_syntax_by_file_name() and find_syntax_by_file_name_extension() 
There is no benefit to keeping separate functions.
 2021-09-22 06:03:24 +02:00
Martin Nordholts
a0c363647f src/assets.rs: Use /// not // for COMPRESS_* consts 2021-09-18 07:05:04 +02:00
Martin Nordholts
d989224a8a HighlightingAssets: Inline absolute_path 
Its name is confusing, because it does not always hold an absolute path. Get rid
of this problem by inlining it.
 2021-09-18 06:19:52 +02:00
Martin Nordholts
82f439e715 HighlightingAssets: Simplify absolute_path with .map_or_else() 2021-09-18 06:19:52 +02:00
Martin Nordholts
b034879eae HighlightingAssets: No need for both path and path_str 2021-09-18 06:19:52 +02:00
Martin Nordholts
9ed9a6fc3d Simplify HighlightingAssets::get_syntax() first_line logic (#1852) 
And make self.get_first_line_syntax() be called lazily.
 2021-09-16 17:01:12 +02:00
Martin Nordholts
e84b702309 Extract some private submodules from 'bat::assets' (#1850) 2021-09-15 07:59:33 +02:00
Martin Nordholts
6226eba52a HighlightingAssets: Add find_syntax_by_extension() helper 2021-09-14 07:38:36 +02:00
Martin Nordholts
9e0ea06435 HighlightingAssets: Add find_syntax_by_name() helper 2021-09-14 07:38:36 +02:00
Marcin Puc
7956485e37 Improve iterator usage 2021-09-12 15:50:10 +02:00
Marcin Puc
372e42f350 Reduce nesting in if blocks by short circuiting 2021-09-12 15:50:10 +02:00
Martin Nordholts
9124271eaf Load independent and minimal syntax sets when using --language (#1787) 
This significantly speeds up the startup time of bat, since only a single
linked SyntaxDefinition is loaded for each file. The size increase of the
binary is just ~400 kB.

In order for startup time to be improved, the --language arg must be used, and
it must match one of the following names:

"Plain Text", "ActionScript", "AppleScript", "Batch File", "NAnt Build File",
"C#", "C", "CSS", "D", "Diff", "Erlang", "Go", "Haskell", "JSON", "Java
Properties", "BibTeX", "LaTeX Log", "TeX", "Lisp", "Lua", "MATLAB", "Pascal",
"R", "Regular Expression", "Rust", "SQL", "Scala", "Tcl", "XML", "YAML", "Apache
Conf", "ARM Assembly", "Assembly (x86_64)", "CMakeCache", "Comma Separated
Values", "Cabal", "CoffeeScript", "CpuInfo", "Dart Analysis Output", "Dart",
"Dockerfile", "DotENV", "F#", "Friendly Interactive Shell (fish)", "Fortran
(Fixed Form)", "Fortran (Modern)", "Fortran Namelist", "fstab", "GLSL",
"GraphQL", "Groff/troff", "group", "hosts", "INI", "Jinja2", "jsonnet",
"Kotlin", "Less", "LLVM", "Lean", "MemInfo", "Nim", "Ninja", "Nix", "passwd",
"PowerShell", "Protocol Buffer (TEXT)", "Puppet", "Rego", "resolv", "Robot
Framework", "SML", "Strace", "Stylus", "Solidity", "Vyper", "Swift",
"SystemVerilog", "TOML", "Terraform", "TypeScript", "TypeScriptReact",
"Verilog", "VimL", "Zig", "gnuplot", "log", "requirements.txt", "Highlight
non-printables", "Private Key", "varlink"

Later commits will improve startup time for more code paths.

* fix some typos and misspellings

* CHANGELOG.md: Add Performance section (preliminary)

* Add a CHANGELOG.md entry for this PR
 2021-09-09 20:52:33 +02:00
Martin Nordholts
87978e7755 Make asset compression optional at compile time (#1825) 
This will be needed to later support zero-copy deserialization of independent
syntax sets, but is interesting and useful on its own.

Instead of deferring serialization and deserialization to syntect, we implement it
ourselves in the same way, but make compression optional.
 2021-09-07 17:21:48 +02:00
Ville Skyttä
7c41bd72da assets: add Debian ucf backups to ignored suffixes 
Refs https://manpages.debian.org/bullseye/ucf/ucf.1.en.html
 2021-08-29 19:55:00 +02:00
Martin Nordholts
19c3e82abf Replace deprecated 'error-chain' with 'thiserror' (#1820) 
We can't use #[from] on Error::Msg(String) because String does not implement Error.
(Which it shouldn't; see e.g. https://internals.rust-lang.org/t/impl-error-for-string/8881.)
So we implement From manually for Error::Msg, since our current code was written
in that way for error-chain.
 2021-08-26 13:12:21 +02:00
Martin Nordholts
f1c0fd7343 Don't take a HighlightingAssets detour to build assets (#1802) 
Move code to build assets to its own file. That results in better modularity and flexibility.

It also allows us to simplify HighlightingAssets a lot, since it will now always
be initialized with a SerializedSyntaxSet.
 2021-08-24 07:58:03 +02:00
Martin Nordholts
ed09f90e5e Fix all lints that are new with Rust 1.54 
They are all of the following type:
https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow
 2021-08-19 07:19:12 +02:00
Martin Nordholts
25fa577cd0 Make 'build-assets' an optional capability for application 
Also structure features a bit more clever to avoid duplication of
feature dependency declarations.
 2021-08-17 10:58:21 +02:00
Martin Nordholts
deddc81426 src/assets.rs: Use ThemeSet::new() instead of BTreeMap::new() 2021-08-17 10:58:21 +02:00