1
0
mirror of https://github.com/sharkdp/bat synced 2026-07-05 14:13:17 +00:00
Commit Graph

885 Commits

Author SHA1 Message Date
David Peter 0080b043c4 Merge branch 'master' into master 2024-02-23 21:35:21 +01:00
cyqsimon 6a6b02117b Apply clippy fixes (#2864)
* Apply clippy fixes

* Write changelog
2024-02-20 19:39:22 +01:00
David Peter bc1ca1a346 Merge branch 'master' into fix-2185 2024-02-12 08:19:56 +01:00
Ethan P. 84d80eebd0 Test for correct categorization of SGR sequences
This adds a regression test for the fix in the previous commit.
2024-02-11 19:40:29 -08:00
Ethan P. 915dd9fbf8 Fix incorrect categorization of SGR sequences
Specifically, prevent other attributes from leaking into the
bold/dim/italic/underline attributes, and ensure that bright backgrounds
are put into the background attribute instead of the foreground
attribute.
2024-02-11 19:35:54 -08:00
Ethan P. 9d77c1373c Fix off-by-one error in line number continuation 2024-02-11 16:49:06 -08:00
mxaddict a5bd9f51be Added JSONC and aws credentials to the syntax mappings 2024-02-11 04:57:42 +08:00
Ethan P 1023399c5e Remove hyperlink when wrapping lines 2024-02-09 22:09:39 -08:00
Ethan P 6549e26f5d Re-emit hyperlinks when wrapping lines 2024-02-09 22:09:39 -08:00
Ethan P 165c495e75 Replace AnsiCodeIterator in printer.rs
This uses the new EscapeSequenceIterator, saving us a preprocessing step
for each line.
2024-02-09 22:09:39 -08:00
Ethan P 6b9b085be3 Add EscapeSequenceIterator
This is an iterator for escape sequences, using
EscapeSequenceOffsetsIterator for the underlying parsing of individual
escape sequences.
2024-02-09 22:09:39 -08:00
Ethan P 054421268f Strip OSC sequences before printing
This commit strips OSC (Operating System Command) sequences before
printing lines. Eventually when time permits, I want to add back
support for printing OSC sequences (and improve it to treat hyperlinks
like an attribute).

Until then, this should help prevent garbled output :)
2024-02-09 22:09:39 -08:00
Ethan P 414403b062 Add EscapeSequenceOffsetsIterator
This can be used to extract a subset of ANSI escape sequences from a
string of text. I have big plans for this eventually, but for now, it'll
be used to strip OSC before printing.
2024-02-09 22:09:35 -08:00
David Tolnay 1a54c9bf6d Eliminate dependency on serde's "derive" feature 2024-02-08 15:55:30 -08:00
Filip Razek e586751208 Attempt to fix integration test 2024-01-21 19:48:26 +01:00
Filip Razek 5c1f47359e Run cargo fmt 2024-01-21 19:48:26 +01:00
Filip Razek 45ee2dc4c7 fix: Wrap file name in header 2024-01-21 19:48:26 +01:00
cyqsimon 230abfd2bc Merge branch 'master' into syntax-mapping-refactor 2024-01-19 15:18:48 +08:00
cyqsimon c0f2d6f934 Add note on subdirectory's irrelevance to ordering 2024-01-18 23:26:00 +08:00
cyqsimon e4d637a3d8 Reverse precedence of syntax mappings specified on CLI 2024-01-18 22:41:57 +08:00
rhysd 8e66bc8722 Make the error handler FnMut 2024-01-17 22:00:29 +01:00
cyqsimon f0a6fe216d Benchmark prototype 2023-12-11 10:38:59 +08:00
cyqsimon 8a08025091 Disable builtin_mappings_are_lazily_evaluated for ARM builds 2023-12-11 10:21:06 +08:00
cyqsimon 586c804b1e Add test: builtin_mappings_are_lazily_evaluated 2023-12-11 10:21:06 +08:00
cyqsimon e30161ac3c Add test: builtin_mappings_matcher_only_compile_once 2023-12-11 10:21:06 +08:00
cyqsimon 3865908439 Add test: custom_mappings_precedence 2023-12-11 10:21:06 +08:00
cyqsimon 9474b4cf8b Rename & sort syntax mapping tests 2023-12-11 10:21:06 +08:00
cyqsimon b48bda21a3 Add test: all_fixed_builtin_mappings_can_compile 2023-12-11 10:21:06 +08:00
cyqsimon 36073a3d95 Document another rule ignore condition 2023-12-11 10:21:06 +08:00
cyqsimon 1f10d846a3 Fix tests
1. for override test, test for something in `common`
2. move git mappings to `common`
2023-12-11 10:21:05 +08:00
cyqsimon 22531eab90 Port all mappings to new system 2023-12-11 10:21:05 +08:00
cyqsimon 0c1b80faab Impl per-target syntax mappings 2023-12-11 10:21:05 +08:00
cyqsimon ad628c0471 Fix iterator lifetime incompatibility 2023-12-11 10:21:05 +08:00
cyqsimon f483d2df42 Lazily compile GlobMatchers 2023-12-11 10:21:05 +08:00
cyqsimon 4ad3002543 s/Lazy<GlobMatcher>/Lazy<Option<GlobMatcher>>/ 2023-12-11 10:21:05 +08: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
cyqsimon 1c7c9a6b6d Split syntax_mapping/builtin.rs 2023-12-11 10:21:05 +08:00
cyqsimon de6d418d42 Remove BuiltinMatcher enum
Explanation added as comments in code
Using plain `Lazy<Option<GlobMatcher>>` is just better
2023-12-11 10:21:04 +08:00
cyqsimon 7e1fbcfe95 Fix visibility for SyntaxMapping::get_syntax_for
This change was made in 31fb708, but then was reverted (I assume incorrectly)
in 6246485.
2023-12-11 10:21:04 +08:00
cyqsimon 0fea82cff9 Minor improvement of variable naming accuracy 2023-12-11 10:20:11 +08:00
cyqsimon 64840fbbae join_segments -> build_glob_string
- this is a more descriptive name
2023-12-11 10:20:11 +08:00
cyqsimon 827b3eca2f Add unset *.conf example 2023-12-11 10:20:11 +08:00
cyqsimon 9478d2dfe8 Isolate variables at compile time 2023-12-11 10:20:11 +08:00
cyqsimon d24501ab5e include! generated mappings in source 2023-12-11 10:20:11 +08:00
cyqsimon 52f94b4623 Clarify syntax selection algorithm behaviour 2023-12-11 10:20:10 +08:00
cyqsimon 37fd050100 Describe filename ordering more accurately 2023-12-11 10:20:10 +08:00
cyqsimon 83286975ff Add ordering prefix to git-config example 2023-12-11 10:20:10 +08:00
cyqsimon f705fcb984 Add global git-config example 2023-12-11 10:20:10 +08:00
cyqsimon 9ca1f20f43 Add specification draft 2023-12-11 10:20:10 +08:00
Lena 28990bc451 fix: display color when NO_COLOR is an empty string (#2767) 2023-12-02 11:43:55 +00:00