Skip to content

Skip comments in remove_pre_ampersands #187

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Skip comments in remove_pre_ampersands #187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
854a8fb
Ignore commented lines in remove_pre_ampersands
max-models Oct 23, 2025
761f329
Use raw string
max-models Oct 23, 2025
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
16 changes: 9 additions & 7 deletions fprettify/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def split(self, line):
LR_OPS_RE = [REL_OP_RE, LOG_OP_RE, plusminus_parser(PLUSMINUS_RE), MULTDIV_RE, PRINT_RE]

USE_RE = re.compile(
SOL_STR + "USE(\s+|(,.+?)?::\s*)\w+?((,.+?=>.+?)+|,\s*only\s*:.+?)?$" + EOL_STR, RE_FLAGS)
SOL_STR + r"USE(\s+|(,.+?)?::\s*)\w+?((,.+?=>.+?)+|,\s*only\s*:.+?)?$" + EOL_STR, RE_FLAGS)

# markups to deactivate formatter
NO_ALIGN_RE = re.compile(SOL_STR + r"&\s*[^\s*]+")
Expand Down Expand Up @@ -1806,13 +1806,15 @@ def remove_pre_ampersands(lines, is_special, filename, line_nr):
match = re.search(SOL_STR + r'(&\s*)', line)
if match:
pre_ampersand.append(match.group(1))
# amount of whitespace before ampersand of previous line:
m = re.search(r'(\s*)&[\s]*(?:!.*)?$', lines[pos - 1])
if not m:
raise FprettifyParseException(
"Bad continuation line format", filename, line_nr)
sep = len(m.group(1))

# find the previous non-comment line
_pos = pos - 1
while _pos >= 0 and lines[_pos].lstrip().startswith('!'):
_pos -= 1
_pos = max(_pos, 0) # ensure non-negative index

m = re.search(r'(\s*)&[\s]*(?:!.*)?$', lines[_pos])
sep = len(m.group(1))
ampersand_sep.append(sep)
else:
pre_ampersand.append('')
Expand Down