Skip to content

Fix OSC-8 hyperlink regex for BEL terminator and hyphenated params #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeff-grimes-pplx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix OSC-8 hyperlink regex for BEL terminator and hyphenated params #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tabulate/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ def escape_empty(val):
_esc = r"\x1b"
_csi = rf"{_esc}\["
_osc = rf"{_esc}\]"
_st = rf"{_esc}\\"
_st = rf"(?:{_esc}\\|\x07)"

_ansi_escape_pat = rf"""
(
Expand All @@ -795,11 +795,11 @@ def escape_empty(val):
|
# terminal hyperlinks
{_osc}8; # OSC opening
(\w+=\w+:?)* # key=value params list (submatch 2)
([\w.-]+=[\w.-]+:?)* # key=value params list (submatch 2)
; # delimiter
([^{_esc}]+) # URI - anything but ESC (submatch 3)
([^{_esc}\x07]+) # URI - anything but ESC or BEL (submatch 3)
{_st} # ST
([^{_esc}]+) # link text - anything but ESC (submatch 4)
([^{_esc}\x07]+) # link text - anything but ESC or BEL (submatch 4)
{_osc}8;;{_st} # "closing" OSC sequence
)
"""
Expand Down
22 changes: 22 additions & 0 deletions test/test_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,3 +598,25 @@ def test_github_escape_pipe_character():
result = tabulate([["foo|bar"]], headers=("spam|eggs",), tablefmt="github")
expected = "| spam\\|eggs |\n|:------------|\n| foo\\|bar |"
assert_equal(expected, result)


def test_alignment_of_bel_and_param_link_cells():
"Regression: Align OSC-8 links terminated by BEL (0x07) or with hyphenated params."
linktable = [
("test", 42, "\x1b]8;;target\x07test\x1b]8;;\x07"),
("test", 101, "\x1b]8;id=doc-1;target\x1b\\test\x1b]8;;\x1b\\"),
]
linkheaders = ("test", "\x1b]8;;target\x07test\x1b]8;;\x07", "test")
formatted = tabulate(linktable, linkheaders, "grid")
expected = "\n".join(
[
"+--------+--------+--------+",
"| test | \x1b]8;;target\x07test\x1b]8;;\x07 | test |",
"+========+========+========+",
"| test | 42 | \x1b]8;;target\x07test\x1b]8;;\x07 |",
"+--------+--------+--------+",
"| test | 101 | \x1b]8;id=doc-1;target\x1b\\test\x1b]8;;\x1b\\ |",
"+--------+--------+--------+",
]
)
assert_equal(expected, formatted)