[conditional-text] Avoid linebreaks when using the shortcode inline #1220
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Until now, using the conditional-text shortcode inside a paragraph caused linebreaks before and after the conditionally included text. This patch fixes the issue.
|
I'd consider the linebreaks to be a bug, so in that sense it's not a
breaking change IMHO. Don't know if anyone else was actually using it.
…On Mon, Sep 5, 2022 at 4:13 PM LisaFC ***@***.***> wrote:
This is great, thanks! Is there any chance any users have been depending
on the line breaks (which I agree should not be there!), making this a
breaking change? @geriom <https://github.com/geriom> @chalin
<https://github.com/chalin> @emckean <https://github.com/emckean>
—
Reply to this email directly, view it on GitHub
<#1220 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AA6AU3LEAK7WXIC6AF2ZAL3V4X5YRANCNFSM6AAAAAAQDZNFEQ>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
|
Good point! OK, I'm happy to merge this as agreed, the existing behaviour is not what I'd expect. |
fekete-robert
added a commit
to fekete-robert/docsy
that referenced
this pull request
Sep 13, 2022
…oogle#1220) Until now, using the conditional-text shortcode inside a paragraph caused linebreaks before and after the conditionally included text. This patch fixes the issue.
chalin
reviewed
Oct 4, 2022
| @@ -1,36 +1,36 @@ | |||
| <!-- Get the current buildcondition from the config and lowercase it --> | |||
| {{ $condition := lower $.Site.Params.buildCondition }} | |||
| {{- $condition := lower $.Site.Params.buildCondition -}} | |||
There was a problem hiding this comment.
Thanks for cleaning up the whitespace issues in this shortcode @fekete-robert.
For next time, it is best to only add the - marker where it is needed. As a general rule of thumb, I favor the end tag -}}. More rarely do we need - on an opening tag, and certainly not in the case where two directives follow each other like this:
{{ if ... -}}
{{ $var := val -}}
{{ $var := val2 -}}
...
/cc @LisaFC
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Until now, using the conditional-text shortcode inside a paragraph
caused linebreaks before and after the conditionally included text.
This patch fixes the issue.