Skip to content

Commit 8087e9b

Browse files
committed
Reduce duplicate code and simplify space accounting in Tilde and Caret
1 parent b613e7f commit 8087e9b

1 file changed

Lines changed: 35 additions & 62 deletions

File tree

‎pymdownx/delimiterprocessor.py‎

Lines changed: 35 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,24 @@ def add_region(self, delim: Delimiter, a: int, b: int, c: int, d: int, size: int
520520
continue
521521
break
522522

523+
def increment_space_trackers(self, delim: Delimiter, length: int) -> None:
524+
"""Increment space trackers."""
525+
526+
if delim.no_space and not delim.single:
527+
if length == 1:
528+
delim.singles += 1
529+
if length != 2:
530+
delim.space_track += 1
531+
532+
def decrement_space_trackers(self, delim: Delimiter, length: int) -> None:
533+
"""Decrement space trackers."""
534+
535+
if delim.no_space and not delim.single:
536+
if length == 1:
537+
delim.singles -= 1
538+
if length != 2:
539+
delim.space_track -= 1
540+
523541
def handleMatch( # type: ignore[override]
524542
self,
525543
m: re.Match[str],
@@ -559,12 +577,7 @@ def handleMatch( # type: ignore[override]
559577

560578
is_ambiguous = m2.lastgroup[0] != 's' # type: ignore[index]
561579
stack.append((start, start + l, is_ambiguous, l))
562-
563-
# Track how many tokens in the stack require or possibly require no spaces.
564-
delim.space_track = 1 if l == 1 or l > 2 else 0
565-
# Track how many single width tokens we have in the stack.
566-
# This bookkeeping allows us to know when we can no longer pair matches.
567-
delim.singles = 1 if l == 1 else 0
580+
self.increment_space_trackers(delim, l)
568581

569582
# Pair tokens until the stack is empty or we can no longer find tokens.
570583
while any(d.stack for d in self.delimiters.values()):
@@ -613,23 +626,17 @@ def handleMatch( # type: ignore[override]
613626
# Reject start/end pair if whitespace requirement is not satisfied.
614627
# Try to find a pair that can work if the first fails.
615628
if delim.no_space:
616-
if not delim.single and delimiter[-1] == 1:
617-
delim.singles -= 1
618629
while True:
619-
okay = True
620-
if (
630+
okay = not (
621631
(delim.space_track or delim.single or current == 1) and
622632
self.check_space(data, delimiter[1], start)
623-
):
624-
okay = False
625-
if stack:
626-
if not delim.single and delimiter[-1] != 2:
627-
delim.space_track -= 1
628-
delimiter = stack.pop()
629-
if not delim.single and delimiter[-1] == 1:
630-
delim.singles -= 1
631-
last = delimiter[-1]
632-
continue
633+
)
634+
635+
self.decrement_space_trackers(delim, delimiter[-1])
636+
if not okay and stack:
637+
delimiter = stack.pop()
638+
last = delimiter[-1]
639+
continue
633640
break
634641

635642
# We've exhausted our options, unable to make a reasonable pair.
@@ -646,14 +653,10 @@ def handleMatch( # type: ignore[override]
646653
self.add_region(delim, delimiter[1] - size, delimiter[1], start, start + size, size)
647654
start += size
648655
current -= size
649-
new = 0
650656
if size < delimiter[-1] and (not delim.double or (delimiter[-1] - size) != 1):
651657
new = delimiter[-1] - size
652658
stack.append((delimiter[0], delimiter[1] - size, delimiter[2], new))
653-
654-
# No space bookkeeping
655-
if delim.no_space and not delim.single and new == 1:
656-
delim.singles += 1
659+
self.increment_space_trackers(delim, new)
657660

658661
if not stack:
659662
if any(d.stack for d in self.delimiters.values() if d is not delim):
@@ -664,27 +667,12 @@ def handleMatch( # type: ignore[override]
664667

665668
last = stack[-1][-1]
666669

667-
# No space bookkeeping
668-
if delim.no_space and not delim.single:
669-
if delimiter[-1] != 2 and new in (2, 0):
670-
delim.space_track -= 1
671-
672-
# TODO: Is this unreachable?
673-
elif delimiter[-1] == 2 and new == 1: # pragma: no cover
674-
delim.space_track += 1
675-
676670
# Should remainder be treated as a new start?
677671
if original >= 3 and current and is_ambiguous:
678672
delim.stack.append((m2.start(0) + (original - current), end, False, current))
673+
self.increment_space_trackers(delim, current)
679674
is_end = False
680675

681-
# No space bookkeeping
682-
if delim.no_space and not delim.single:
683-
if current != 2:
684-
delim.space_track += 1
685-
if current == 1:
686-
delim.singles += 1
687-
688676
# Do we still have more to consume?
689677
else:
690678
is_end = current and stack and last > current
@@ -699,12 +687,7 @@ def handleMatch( # type: ignore[override]
699687

700688
# Don't pair with an ambiguous opening
701689
while stack and delimiter[-1] != 3 and delimiter[2]:
702-
# TODO: Is this unreachable?
703-
if delim.no_space and not delim.single: # pragma: no cover
704-
if delimiter[-1] != 2:
705-
delim.space_track -= 1
706-
if delimiter[-1] == 1:
707-
delim.singles -= 1
690+
self.decrement_space_trackers(delim, delimiter[-1])
708691
delimiter = stack.pop()
709692
last = delimiter[-1]
710693
if delimiter[2] and delimiter[-1] != 3:
@@ -723,6 +706,7 @@ def handleMatch( # type: ignore[override]
723706
# Create new region if end is valid.
724707
# If not valid, ignore the end but continue parsing.
725708
if not ignore:
709+
self.decrement_space_trackers(delim, delimiter[-1])
726710
is_start = False
727711
ds, de = delimiter[:2]
728712
while current and (not delim.double or current != 1):
@@ -733,15 +717,10 @@ def handleMatch( # type: ignore[override]
733717
current -= size
734718
last -= size
735719
de -= size
736-
if not delim.double or last > 1:
737-
stack.append((ds, de, False, last))
738720

739-
# Bookkeeping for no space requirement
740-
if delim.no_space and not delim.single:
741-
if last == 1:
742-
delim.singles += 1
743-
if delimiter[-1] != 2 and last in (2, 0):
744-
delim.space_track -= 1
721+
if last and (not delim.double or last > 1):
722+
stack.append((ds, de, False, last))
723+
self.increment_space_trackers(delim, last)
745724

746725
# Find opening tokens
747726
# Looking for:
@@ -762,13 +741,7 @@ def handleMatch( # type: ignore[override]
762741
continue
763742

764743
stack.append((start, end, is_ambiguous, current))
765-
766-
# Bookkeeping for no space requirement
767-
if delim.no_space and not delim.single:
768-
if current != 2:
769-
delim.space_track += 1
770-
if current == 1:
771-
delim.singles += 1
744+
self.increment_space_trackers(delim, current)
772745

773746
# Build the HTML elements
774747
for delim in self.delimiters.values():

0 commit comments

Comments
 (0)