KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hyperlinked_grep: Ensure filename is always printed

Browse Source 
Fixes hyperlinks not working when a single file is searched
This commit is contained in:
Kovid Goyal 2020-09-23 19:11:09 +05:30
parent d09666aba9
commit 8bea61cb99
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/kittens/hyperlinked_grep.rst
View File

@ -53,3 +53,9 @@ actions, :doc:`see here <../open_actions>`.
Hopefully, someday this functionality will make it into some `upstream grep Hopefully, someday this functionality will make it into some `upstream grep
<https://github.com/BurntSushi/ripgrep/issues/665>`_ <https://github.com/BurntSushi/ripgrep/issues/665>`_
program directly removing the need for this kitten. program directly removing the need for this kitten.
.. note::
While you can pass any of ripgrep's comand line options to the kitten and
they will be forwarded to rg, do not use options that change the output
formatting as the kitten works by parsing the output from ripgrep.

2
kittens/hyperlinked_grep/main.py
View File

@ -25,7 +25,7 @@ def write_hyperlink(write: Callable[[bytes], None], url: bytes, line: bytes, fra
def main() -> None: def main() -> None:
if not sys.stdout.isatty() and '--pretty' not in sys.argv: if not sys.stdout.isatty() and '--pretty' not in sys.argv:
os.execlp('rg', 'rg', *sys.argv[1:]) os.execlp('rg', 'rg', *sys.argv[1:])
cmdline = ['rg', '--pretty'] + sys.argv[1:] cmdline = ['rg', '--pretty', '--with-filename'] + sys.argv[1:]
p = subprocess.Popen(cmdline, stdout=subprocess.PIPE) p = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
assert p.stdout is not None assert p.stdout is not None
write: Callable[[bytes], None] = cast(Callable[[bytes], None], sys.stdout.buffer.write) write: Callable[[bytes], None] = cast(Callable[[bytes], None], sys.stdout.buffer.write)