Skip to content

Improve ppcomp expanded output over line breaks #1910

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

Merged
windymilla merged 1 commit into from
Aug 1, 2026
Merged

Improve ppcomp expanded output over line breaks #1910

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
12 changes: 11 additions & 1 deletion src/guiguts/tools/ppcomp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
FLAG_CH_1_R = "⦔"
FLAG_CH_2_L = "⦕"
FLAG_CH_2_R = "⦖"
FLAG_NL = "⦑"
NO_SPACE_BEFORE = "])}.,:;!?"
NO_SPACE_AFTER = "[({"
PAIR_RE = re.compile(
Expand Down Expand Up @@ -729,6 +730,7 @@ def flush_changes():
# New source line → flush current output line
# Compact flushes if either source file changes line
# Expanded only flushes if first source file changes line
# but still want to know if second file changes line to aid output
if (expanded and a_line != last_a) or (
not expanded and (a_line, b_line) != (last_a, last_b)
):
Expand All @@ -738,6 +740,8 @@ def flush_changes():
line_has_change = False
cur_line = []
cur_linenum = None
elif expanded and b_line != last_b:
new_buf.append(FLAG_NL)

last_a, last_b = a_line, b_line

Expand Down Expand Up @@ -794,7 +798,13 @@ def flush_changes():
dialog.add_entry(f"{spaces}{before_line}", no_lineno)
dialog.new_section()
break
dialog.add_entry(f"{sub_line}{text}", index)
text = re.sub(f" *{FLAG_NL} *", "\n", text)
for idx, one_line in enumerate(text.splitlines()):
if idx == 0:
dialog.add_entry(f"{sub_line}{one_line}", index)
else:
dialog.add_entry(f"{spaces}{one_line}", no_lineno)
dialog.new_section()
if expanded:
for i in range(a_line, len(PPcompChecker.files[0].lines)):
after_line = re.sub(
Expand Down
Loading