Omit the newline from EndFormat if no parameters are present

Bug: T282031
Change-Id: I631ca08e6e7717e72978debc496ac2ebac21133f
This commit is contained in:
Arlo Breault 2021-05-10 15:12:04 -04:00
parent 920dd0c438
commit 03d838ab4a

View file

@ -307,7 +307,7 @@ Begin with `StartFormat`, and replace the `Hole` with the name of the template t
For each parameter, if `ParameterFormat` begins with a newline and the last line in the output string is nothing but whitespace and comments, then delete the newline from the beginning of the `ParameterFormat`. Then append `ParameterFormat` to the output string after replacing the first `Hole` with the name of the parameter and the second `Hole` with the value of the parameter. For each parameter, if `ParameterFormat` begins with a newline and the last line in the output string is nothing but whitespace and comments, then delete the newline from the beginning of the `ParameterFormat`. Then append `ParameterFormat` to the output string after replacing the first `Hole` with the name of the parameter and the second `Hole` with the value of the parameter.
Finally, if `EndFormat` begins with a newline and the last line in the output string is nothing but whitespace and comments, then delete the newline from the beginning of the `EndFormat`. Append the `EndFormat` to the output string. Finally, if `EndFormat` begins with a newline and the last line in the output string is nothing but whitespace and comments, then delete the newline from the beginning of the `EndFormat`. Or, if there were no parameters, also delete the newline from the beginning of the `EndFormat`. Append the `EndFormat` to the output string.
Some example format strings: Some example format strings:
@ -321,8 +321,7 @@ Block formatting: `{{_\n| _ = _\n}}`
{{Foo {{Foo
| bar = baz | bar = baz
| qux = quux | qux = quux
}}{{Bar }}{{Bar}}
}}
``` ```
No space before the parameter name, each template on its own line: `\n{{_\n|_ = _\n}}\n` No space before the parameter name, each template on its own line: `\n{{_\n|_ = _\n}}\n`
@ -331,8 +330,7 @@ No space before the parameter name, each template on its own line: `\n{{_\n|_ =
|bar = baz |bar = baz
|qux = quux |qux = quux
}} }}
{{Bar {{Bar}}
}}
``` ```
Indent each parameter: `{{_\n |_ = _\n}}` Indent each parameter: `{{_\n |_ = _\n}}`
@ -340,8 +338,7 @@ Indent each parameter: `{{_\n |_ = _\n}}`
{{Foo {{Foo
|bar = baz |bar = baz
|qux = quux |qux = quux
}}{{Bar }}{{Bar}}
}}
``` ```
Align all parameter names to a given length: `{{_\n|_______________ = _\n}}\n` Align all parameter names to a given length: `{{_\n|_______________ = _\n}}\n`
@ -351,8 +348,7 @@ Align all parameter names to a given length: `{{_\n|_______________ = _\n}}\n`
|qux = quux |qux = quux
|veryverylongparameter = bat |veryverylongparameter = bat
}} }}
{{Bar {{Bar}}
}}
``` ```
Pipe characters at the end of the previous line: `{{_|\n _______________ = _}}` Pipe characters at the end of the previous line: `{{_|\n _______________ = _}}`