Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@hugovk
hugovk committed Dec 15, 2024
1 parent ab05beb commit 3b75f5f
Showing 1 changed file with 51 additions and 21 deletions.
72 changes: 51 additions & 21 deletions Lib/difflib.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -855,37 +855,49 @@ def compare(self, a, b):
+ tree
+ emu
"""
from _colorize import ANSIColors

green, red = ANSIColors.GREEN, ANSIColors.RED
cruncher = SequenceMatcher(self.linejunk, a, b)
for tag, alo, ahi, blo, bhi in cruncher.get_opcodes():
if tag == 'replace':
g = self._fancy_replace(a, alo, ahi, b, blo, bhi)
elif tag == 'delete':
g = self._dump('-', a, alo, ahi)
g = self._dump('-', a, alo, ahi, red)
elif tag == 'insert':
g = self._dump('+', b, blo, bhi)
g = self._dump('+', b, blo, bhi, green)
elif tag == 'equal':
g = self._dump(' ', a, alo, ahi)
else:
raise ValueError('unknown tag %r' % (tag,))

yield from g

def _dump(self, tag, x, lo, hi):
def _dump(self, tag, x, lo, hi, color=None):
"""Generate comparison results for a same-tagged range."""
for i in range(lo, hi):
yield '%s %s' % (tag, x[i])

if color:
from _colorize import ANSIColors

for i in range(lo, hi):
yield f'{color}{tag} {x[i]}{ANSIColors.RESET}'
else:
for i in range(lo, hi):
yield '%s %s' % (tag, x[i])

def _plain_replace(self, a, alo, ahi, b, blo, bhi):
assert alo < ahi and blo < bhi
from _colorize import ANSIColors

green, red, reset = ANSIColors.GREEN, ANSIColors.RED, ANSIColors.RESET
# dump the shorter block first -- reduces the burden on short-term
# memory if the blocks are of very different sizes
if bhi - blo < ahi - alo:
first = self._dump('+', b, blo, bhi)
second = self._dump('-', a, alo, ahi)
else:
first = self._dump('-', a, alo, ahi)
second = self._dump('+', b, blo, bhi)
first = self._dump(f'-', a, alo, ahi, red)
second = self._dump('+', b, blo, bhi, green)

for g in first, second:
yield from g
Expand Down Expand Up @@ -983,14 +995,17 @@ def _fancy_replace(self, a, alo, ahi, b, blo, bhi):
b, dump_j, bhi)

def _fancy_helper(self, a, alo, ahi, b, blo, bhi):
from _colorize import ANSIColors

green, red = ANSIColors.GREEN, ANSIColors.RED
g = []
if alo < ahi:
if blo < bhi:
g = self._plain_replace(a, alo, ahi, b, blo, bhi)
else:
g = self._dump('-', a, alo, ahi)
g = self._dump('-', a, alo, ahi, red)
elif blo < bhi:
g = self._dump('+', b, blo, bhi)
g = self._dump('+', b, blo, bhi, green)

yield from g

Expand All @@ -1010,16 +1025,19 @@ def _qformat(self, aline, bline, atags, btags):
'+ \tabcdefGhijkl\n'
'? \t ^ ^ ^\n'
"""
from _colorize import ANSIColors

green, red, reset = ANSIColors.GREEN, ANSIColors.RED, ANSIColors.RESET
atags = _keep_original_ws(aline, atags).rstrip()
btags = _keep_original_ws(bline, btags).rstrip()

yield "- " + aline
yield f"{red}- {aline}{reset}"
if atags:
yield f"? {atags}\n"
yield f"{red}? {atags}{reset}\n"

yield "+ " + bline
yield f"{green}+ {bline}{reset}"
if btags:
yield f"? {btags}\n"
yield f"{green}? {btags}{reset}\n"

# With respect to junk, an earlier version of ndiff simply refused to
# *start* a match with a junk element. The result was cases like this:
Expand Down Expand Up @@ -1132,14 +1150,17 @@ def unified_diff(a, b, fromfile='', tofile='', fromfiledate='',
"""

_check_types(a, b, fromfile, tofile, fromfiledate, tofiledate, lineterm)
from _colorize import ANSIColors

green, red, reset = ANSIColors.GREEN, ANSIColors.RED, ANSIColors.RESET
started = False
for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n):
if not started:
started = True
fromdate = '\t{}'.format(fromfiledate) if fromfiledate else ''
todate = '\t{}'.format(tofiledate) if tofiledate else ''
yield '--- {}{}{}'.format(fromfile, fromdate, lineterm)
yield '+++ {}{}{}'.format(tofile, todate, lineterm)
yield f'{red}--- {fromfile}{fromdate}{lineterm}{reset}'
yield f'{green}+++ {tofile}{todate}{lineterm}{reset}'

first, last = group[0], group[-1]
file1_range = _format_range_unified(first[1], last[2])
Expand All @@ -1153,10 +1174,10 @@ def unified_diff(a, b, fromfile='', tofile='', fromfiledate='',
continue
if tag in {'replace', 'delete'}:
for line in a[i1:i2]:
yield '-' + line
yield f'{red}-{line}{reset}'
if tag in {'replace', 'insert'}:
for line in b[j1:j2]:
yield '+' + line
yield f'{green}+{line}{reset}'


########################################################################
Expand Down Expand Up @@ -1221,14 +1242,17 @@ def context_diff(a, b, fromfile='', tofile='',

_check_types(a, b, fromfile, tofile, fromfiledate, tofiledate, lineterm)
prefix = dict(insert='+ ', delete='- ', replace='! ', equal=' ')
from _colorize import ANSIColors

green, red, reset = ANSIColors.GREEN, ANSIColors.RED, ANSIColors.RESET
started = False
for group in SequenceMatcher(None,a,b).get_grouped_opcodes(n):
if not started:
started = True
fromdate = '\t{}'.format(fromfiledate) if fromfiledate else ''
todate = '\t{}'.format(tofiledate) if tofiledate else ''
yield '*** {}{}{}'.format(fromfile, fromdate, lineterm)
yield '--- {}{}{}'.format(tofile, todate, lineterm)
yield f'{red}*** {fromfile}{fromdate}{reset}{lineterm}'
yield f'{green}--- {tofile}{todate}{reset}{lineterm}'

first, last = group[0], group[-1]
yield '***************' + lineterm
Expand All @@ -1240,7 +1264,10 @@ def context_diff(a, b, fromfile='', tofile='',
for tag, i1, i2, _, _ in group:
if tag != 'insert':
for line in a[i1:i2]:
yield prefix[tag] + line
if tag in {'replace', 'delete'}:
yield f'{red}{prefix[tag]}{line}{reset}'
else:
yield prefix[tag] + line

file2_range = _format_range_context(first[3], last[4])
yield '--- {} ----{}'.format(file2_range, lineterm)
Expand All @@ -1249,7 +1276,10 @@ def context_diff(a, b, fromfile='', tofile='',
for tag, _, _, j1, j2 in group:
if tag != 'delete':
for line in b[j1:j2]:
yield prefix[tag] + line
if tag in {'replace', 'insert'}:
yield f'{green}{prefix[tag]}{line}{reset}'
else:
yield prefix[tag] + line

def _check_types(a, b, *args):
# Checking types is weird, but the alternative is garbled output when
Expand Down

0 comments on commit 3b75f5f

Please sign in to comment.