Skip to content

gh-113317: Argument Clinic: tear out internal text accumulator APIs #113402

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
erlend-aasland merged 5 commits into from
Dec 22, 2023
Merged

gh-113317: Argument Clinic: tear out internal text accumulator APIs #113402

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb85794
gh-113317: Argument Clinic: tear out internal text accumulator APIs
erlend-aasland Dec 21, 2023
71534ea
Add more suggestions
erlend-aasland Dec 22, 2023
71e0ead
Update Tools/clinic/clinic.py
erlend-aasland Dec 22, 2023
b1ff628
Move TextAccumulator
erlend-aasland Dec 22, 2023
144b115
Update clinic.py
erlend-aasland Dec 22, 2023
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
Prev Previous commit
Next Next commit
Add more suggestions
  • Loading branch information
@erlend-aasland
erlend-aasland committed Dec 22, 2023
commit 71534ea92df04d6c5b80e0701e4f84482c55e5a2
15 changes: 5 additions & 10 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,14 +257,12 @@ def linear_format(s: str, **kwargs: str) -> str:
for line in s.split('\n'):
indent, curly, trailing = line.partition('{')
if not curly:
lines.append(line)
lines.append('\n')
lines.extend([line, "\n"])
continue

name, curly, trailing = trailing.partition('}')
if not curly or name not in kwargs:
lines.append(line)
lines.append('\n')
lines.extend([line, "\n"])
continue

if trailing:
Expand All @@ -280,8 +278,7 @@ def linear_format(s: str, **kwargs: str) -> str:

stripped = [line.rstrip() for line in value.split("\n")]
value = textwrap.indent("\n".join(stripped), indent)
lines.append(value)
lines.append('\n')
lines.extend([value, "\n"])

return "".join(lines[:-1])

Expand Down Expand Up @@ -6232,8 +6229,7 @@ def add_parameter(text: str) -> None:
else:
s = ' ' + text
if line_length + len(s) >= 72:
lines.append('\n')
lines.append(indent)
lines.extend(["\n", indent])
line_length = len(indent)
s = text
line_length += len(s)
Expand All @@ -6260,8 +6256,7 @@ def add_parameter(text: str) -> None:
added_star = True
add_parameter('*,')

p_lines = []
p_lines.append(fix_right_bracket_count(p.right_bracket_count))
p_lines = [fix_right_bracket_count(p.right_bracket_count)]

if isinstance(p.converter, self_converter):
# annotate first parameter as being a "self".
Expand Down