Skip to content

Commit 975df96

Browse files
committed
fix
1 parent ac45da1 commit 975df96

File tree

1 file changed

+5
-4
lines changed
  • src/sphinx_codeautolink/extension

1 file changed

+5
-4
lines changed

src/sphinx_codeautolink/extension/block.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,22 +374,23 @@ def link_html(
374374
no_dot_prere = r'(?<!<span class="o">\.</span>)()'
375375
# Potentially instead assert an initial closing parenthesis followed by a dot.
376376
call_dot_prere = r'(\)</span>\s*<span class="o">\.</span>\s*)'
377+
# Pygments 2.19 changed import whitespace highlighting
378+
# so we need to support both for now (see #152)
377379
import_prere = (
378380
r'((<span class="kn">import</span>(<span class="w">\s+</span>)|(/s+)(<span class="p">\(</span>\s*)?)'
379-
r'|(<span class="[op]">,</span>\s*))'
381+
r'|(<span class="[op]">,</span>(<span class="w">\s*</span>)|(\s*)))'
380382
)
381-
from_prere = r'(<span class="kn">from</span><span class="w">\s+</span>)'
383+
from_prere = r'(<span class="kn">from</span>(<span class="w">\s+</span>)|(\s+))'
382384

383385
no_dot_postre = r'(?!(<span class="o">\.)|(</a>))'
384386
import_postre = (
385387
r'(?=($)|(\s+)|(<span class="w">)|(<span class="[op]">,</span>)|(<span class="p">\)))(?!</a>)'
386388
)
387-
from_postre = r'(?=<span class="w">\s*</span><span class="kn">import</span>)'
389+
from_postre = r'(?=(<span class="w">\s*</span>)|(\s*)<span class="kn">import</span>)'
388390

389391

390392
def construct_name_pattern(name: Name) -> str:
391393
"""Construct a regex pattern for searching a name in HTML."""
392-
print(name)
393394
if name.context == LinkContext.none:
394395
parts = name.code_str.split(".")
395396
pattern = period.join(

0 commit comments

Comments
 (0)