Skip to content

Commit

Permalink
Merge pull request #2805 from Anomalocaridid/refactor-lessopen
Browse files Browse the repository at this point in the history
Rework `lessopen` implementation to use `execute` crate instead of `run_script`
  • Loading branch information
keith-hall authored Jan 6, 2025
2 parents 18ed69a + 96e4882 commit ae07586
Show file tree
Hide file tree
Showing 5 changed files with 127 additions and 168 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
- Fix panel width when line 10000 wraps, see #2854 (@eth-p)
- Fix compile issue of `time` dependency caused by standard library regression #3045 (@cyqsimon)
- Fix override behavior of --plain and --paging, see issue #2731 and PR #3108 (@einfachIrgendwer0815)
- Fix bugs in `$LESSOPEN` support, see #2805 (@Anomalocaridid)

## Other

Expand Down
126 changes: 48 additions & 78 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ minimal-application = [
]
git = ["git2"] # Support indicating git modifications
paging = ["shell-words", "grep-cli"] # Support applying a pager on the output
lessopen = ["run_script", "os_str_bytes/conversions"] # Support $LESSOPEN preprocessor
lessopen = ["execute"] # Support $LESSOPEN preprocessor
build-assets = ["syntect/yaml-load", "syntect/plist-load", "regex", "walkdir"]

# You need to use one of these if you depend on bat as a library:
Expand Down Expand Up @@ -66,8 +66,7 @@ regex = { version = "1.10.6", optional = true }
walkdir = { version = "2.5", optional = true }
bytesize = { version = "1.3.0" }
encoding_rs = "0.8.35"
os_str_bytes = { version = "~7.0", optional = true }
run_script = { version = "^0.10.1", optional = true}
execute = { version = "0.2.13", optional = true }
terminal-colorsaurus = "0.4"

[dependencies.git2]
Expand Down
Loading

0 comments on commit ae07586

Please sign in to comment.