From c4c81341a263908060a0d54e3903b056ce18324d Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sat, 8 Apr 2023 14:55:24 -0700 Subject: [PATCH] colorize each chunk all at once --- coder.py | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/coder.py b/coder.py index e88e5cb7d..7b3f7123a 100755 --- a/coder.py +++ b/coder.py @@ -265,7 +265,6 @@ MAKE ANY CHANGES BASED OFF THESE FILES! in_diff = False diff_lines = [] - lexer = None def print_lines(): if not diff_lines: @@ -292,30 +291,19 @@ MAKE ANY CHANGES BASED OFF THESE FILES! if check == '>>>>>>> UPDATED': print_lines() in_diff = False - lexer = None diff_lines = [] if check == '=======': - if len(diff_lines) >= 3: - print_lines() - diff_lines = [] - + print_lines() + diff_lines = [] print(line) elif in_diff: - if lexer is None: - diff_lines.append(line) - if len(diff_lines) >= 3: - print_lines() - diff_lines = [] - else: - code = highlight(line, lexer, formatter) - print(code, end='') + diff_lines.append(line) else: print(line) if line.strip() == '<<<<<<< ORIGINAL': in_diff = True - lexer = None diff_lines = [] if partial_line: