Commit Graph

3037 Commits

Author SHA1 Message Date
Ethan P.
aa3ec109b7
First StyleComponentList should remove from 'auto' style.
This happens when there are no `--style` arguments other than the one
passed in as a command line argument.

Prior to this change, removing a style component (e.g. `--style=-numbers`)
would remove the component from an empty style component set, resulting
in no styles at all. That behaviour was less intuitive than the new
behaviour, which starts out with the default components and
removes the line numbers.
2024-07-30 21:22:02 -07:00
Ethan P.
180a77ee99
Add integration tests for merging styles
A huge thanks to @einfachIrgendwer0815 for helping me make sure
these tests work under the MSRV CI job.
2024-07-30 21:22:00 -07:00
Ethan P.
93b25d75a0
Join env var options with "=" instead of " "
Joining them with a space was causing certain styles (e.g. `-grid`) to
be misinterpreted as a separate option.
2024-07-30 21:21:58 -07:00
Ethan P.
6e91ba83b7
Update clap/docs for merging --style arguments 2024-07-30 21:21:55 -07:00
Ethan P.
b74c125c43
Support merging --style arguments
The `overrides_with` clap builder option was removed
because it interfered with the matcher's ability to
retain all occurrences of `--style`.

The behavior it covered is expressed within the new
`forced_style_components` function.
2024-07-30 21:21:53 -07:00
Keith Hall
fd1e0d5876
Merge pull request #2995 from akinomyoga/update-man
Update the man page of bat (`assets/manual/bat.1.in`)
2024-07-29 07:14:31 +03:00
Koichi Murase
9a650e8279 Update CHANGELOG 2024-07-29 12:18:40 +09:00
Koichi Murase
d5aa9d8e05 Add options generated by completions to the man page 2024-07-29 12:18:40 +09:00
Koichi Murase
b1cdc06430 Add --no-* options to Bash/Zsh completions 2024-07-29 12:18:40 +09:00
Koichi Murase
83a15ac05f Add --cache-dir to Fish completion 2024-07-29 12:18:40 +09:00
Koichi Murase
43a77a42f8 Add options present in --help to Bash completion 2024-07-29 12:18:40 +09:00
Koichi Murase
44ca1e7df1 Add options present in --help to the man page 2024-07-29 12:18:40 +09:00
Michael Vorburger
23fd200482 Associate JSON-LD .jsonld files with json syntax (fixes #3036)
Use PR instead of Issue # number in CHANGELOG.

Clean up (unify) CHANGELOG.
2024-07-27 15:48:02 +02:00
Keith Hall
9f1c62b013
Merge pull request #3031 from brenton-at-pieces/add-cfml
add CFML syntax
2024-07-26 19:45:44 +03:00
Brenton Bostick
1488a4a006
Merge branch 'master' into add-cfml 2024-07-26 09:09:30 -04:00
Keith Hall
56d2823b0e
Merge pull request #3045 from cyqsimon/time
Bump time to 0.3.36 (fixes #3043)
2024-07-26 12:12:57 +03:00
cyqsimon
1a11ba11e3
Write changelog 2024-07-26 16:18:16 +08:00
cyqsimon
c34bdb5e66
Bump time to 0.3.36 (fixes #3043) 2024-07-26 16:10:17 +08:00
Brenton Bostick
10456e1d51
Merge branch 'master' into add-cfml 2024-07-25 15:54:50 -04:00
Keith Hall
bbdadc7e38
Merge pull request #3038 from vorburger/bump-textproto
Update the Protobuf sobmodule in order to add `.textproto` support
2024-07-23 23:02:35 +03:00
Michael Vorburger
ff71e32c0f Update the Protobuf sobmodule (fixes #2542) 2024-07-21 23:14:12 +02:00
Brenton Bostick
50b01ea8da update CHANGELOG 2024-07-17 16:17:41 -04:00
Brenton Bostick
de697f7717 add CFML syntax 2024-07-17 15:46:38 -04:00
dependabot[bot]
6fc58821a5
Bump anyhow from 1.0.78 to 1.0.86 (#3021)
Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.78 to 1.0.86.
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.78...1.0.86)

---
updated-dependencies:
- dependency-name: anyhow
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-01 03:34:46 +00:00
dependabot[bot]
7873b473e8
Bump unicode-width from 0.1.11 to 0.1.13 (#3019)
Bumps [unicode-width](https://github.com/unicode-rs/unicode-width) from 0.1.11 to 0.1.13.
- [Commits](https://github.com/unicode-rs/unicode-width/compare/v0.1.11...v0.1.13)

---
updated-dependencies:
- dependency-name: unicode-width
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-01 03:16:35 +00:00
dependabot[bot]
609005a225
Bump encoding_rs from 0.8.33 to 0.8.34 (#3020)
Bumps [encoding_rs](https://github.com/hsivonen/encoding_rs) from 0.8.33 to 0.8.34.
- [Commits](https://github.com/hsivonen/encoding_rs/compare/v0.8.33...v0.8.34)

---
updated-dependencies:
- dependency-name: encoding_rs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-01 02:51:38 +00:00
dependabot[bot]
b9c74ab859
Bump walkdir from 2.4.0 to 2.5.0 (#3018)
Bumps [walkdir](https://github.com/BurntSushi/walkdir) from 2.4.0 to 2.5.0.
- [Commits](https://github.com/BurntSushi/walkdir/compare/2.4.0...2.5.0)

---
updated-dependencies:
- dependency-name: walkdir
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-01 02:29:47 +00:00
Driss Boumlik
cee5584daf Fix cmder link 2024-06-29 14:57:40 +02:00
Bryan Honof
b265b20721 Add flox install 2024-06-23 13:52:52 +02:00
Ethan P
a7a9727c11
Merge pull request #2999 from eth-p/strip-ansi-from-input-option
Add option to remove ANSI escape sequences from bat's input.
2024-06-17 18:37:22 -07:00
Ethan P.
90dfa7f18d
Update README.md to mention --strip-ansi 2024-06-17 18:27:39 -07:00
Ethan P.
3f8d62e7d6
Update CHANGELOG.md 2024-06-17 18:27:39 -07:00
Ethan P.
3f22311ec8
Add ANSI stripping to bat-as-a-library 2024-06-17 18:27:39 -07:00
Ethan P.
9e8176b1c6
Add --strip-ansi=auto option
When using `auto`, escape sequences will be stripped unless printing
plain text.
2024-06-17 18:27:33 -07:00
Ethan P.
70ff93d238
Add --strip-ansi option 2024-06-16 16:49:07 -07:00
Tong Zhaoqi
c264ecd26b
ci: support aarch64 statically-linked binary (#2992) 2024-06-16 20:16:11 +02:00
Ethan P
10a1b24191
Merge pull request #2998 from eth-p/improve-preprocessor
Update bat's tab expansion preprocessor to use bat's ANSI escape sequence iterator.
2024-06-15 16:28:05 -07:00
Ethan P.
243819ecdc
Update CHANGELOG.md 2024-06-15 16:18:29 -07:00
Ethan P.
9c76b72825
Update expand_tabs to use bat's ANSI iterator 2024-06-10 20:07:54 -07:00
Ethan P.
b4fe182960
Make EscapeSequenceOffsetsIterator pub, add fns to get indices 2024-06-10 20:04:17 -07:00
dependabot[bot]
b7e44c76dc
Bump semver from 1.0.21 to 1.0.23 (#2981)
Bumps [semver](https://github.com/dtolnay/semver) from 1.0.21 to 1.0.23.
- [Release notes](https://github.com/dtolnay/semver/releases)
- [Commits](https://github.com/dtolnay/semver/compare/1.0.21...1.0.23)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-01 03:31:50 +00:00
dependabot[bot]
f3cc69733f
Bump thiserror from 1.0.53 to 1.0.61 (#2979)
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.53 to 1.0.61.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.53...1.0.61)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-01 03:18:21 +00:00
dependabot[bot]
3625f0ea1c
Bump itertools from 0.12.1 to 0.13.0 (#2978)
Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.12.1 to 0.13.0.
- [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-itertools/itertools/compare/v0.12.1...v0.13.0)

---
updated-dependencies:
- dependency-name: itertools
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-01 03:04:56 +00:00
dependabot[bot]
e6e2d4c65d
Bump flate2 from 1.0.28 to 1.0.30 (#2980)
Bumps [flate2](https://github.com/rust-lang/flate2-rs) from 1.0.28 to 1.0.30.
- [Release notes](https://github.com/rust-lang/flate2-rs/releases)
- [Commits](https://github.com/rust-lang/flate2-rs/compare/1.0.28...1.0.30)

---
updated-dependencies:
- dependency-name: flate2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-01 02:48:23 +00:00
dependabot[bot]
340e873eff
Bump git2 from 0.18.2 to 0.18.3 (#2977)
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.18.2 to 0.18.3.
- [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/git2-rs/compare/git2-0.18.2...git2-0.18.3)

---
updated-dependencies:
- dependency-name: git2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-01 02:24:10 +00:00
Keith Hall
3407bf4bf6
Merge pull request #2970 from ccqpein/master
Patch the lisp syntax
2024-05-31 23:30:08 +03:00
ccQpein
25cd4991d2 update lisp test 2024-05-31 12:39:19 -04:00
ccQpein
503b2c5126 fix the prefix 2024-05-27 16:22:07 -04:00
ccQpein
026bc05d70 changelog 2024-05-27 15:58:04 -04:00
ccQpein
61005f19fa patch the lisp syntax 2024-05-27 15:52:26 -04:00