diff options
| author | Dan Davison <dandavison7@gmail.com> | 2021-11-14 14:15:51 -0500 |
|---|---|---|
| committer | Dan Davison <dandavison7@gmail.com> | 2021-11-22 13:18:15 -0500 |
| commit | 07892bc572a92bca8e3fec3d1b0ba717d80cc096 (patch) | |
| tree | 8da5b5e842d95291edd2bf29b6b1b2dce345fbb1 /Cargo.lock | |
| parent | ce6258d1b85f9a4624a430cc2aac2a510aabb08a (diff) | |
Handle grep output
- Handle standard filepath:code and filepath:line_number:code output
as produced by `git grep`, `rg -H`, `grep -H`, etc (with -n for line
numbers).
- Retain the match highlighting as produced by the grep tool, and
expose it in delta's color output styled with grep-match-style.
(Note that --color=always is needed to retain the color if piping
into delta, but not for `git grep` when delta is configured as git's
pager)
- Special handling of -p, and -W options of `git grep`: these display
the function context in which the matches occur.
- `navigate` keybindings jump between match function contexts under
`git grep -p` and between matching lines under `git grep -W`.
Thanks @zachriggle for the proposal.
Fixes #769
Diffstat (limited to 'Cargo.lock')
| -rw-r--r-- | Cargo.lock | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -375,6 +375,8 @@ dependencies = [ "palette", "pathdiff", "regex", + "serde", + "serde_json", "shell-words", "smol_str", "structopt", @@ -945,6 +947,9 @@ name = "serde" version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" +dependencies = [ + "serde_derive", +] [[package]] name = "serde_derive" @@ -959,9 +964,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.61" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" +checksum = "e277c495ac6cd1a01a58d0a0c574568b4d1ddf14f59965c6a58b8d96400b54f3" dependencies = [ "itoa", "ryu", |