Preserve indentation inside codeblocks #3084
Merged
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
dos65
force-pushed
the
code_blocks_fix
branch
from
aea35eb
to
1d9798e
Compare
kitbellew
requested changes
Jan 27, 2022
| @@ -3218,3 +3218,33 @@ object a { | |||
| */ | |||
| val a = 1 | |||
| } | |||
| <<< preserve indentation in code blocks | |||
| docstrings.style = Asterisk | |||
There was a problem hiding this comment.
you need to do this for all styles, otherwise it's not fully tested. AsteriskSpace is the tricky one. i would also recommend switching styles; that is, write the original in, say, SpaceAsterisk but ask to reformat as AsteriskSpace. and make sure it still works and doesn't lead to non-idempotence.
scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala
Outdated
Show resolved
Hide resolved
| offsetOpt match { | ||
| case Some(offset) => | ||
| val extra = math.max(0, offset - leadingMargin) | ||
| sb.append(getIndentation((extra >> 1) << 1)) |
There was a problem hiding this comment.
this part may not have been ideal but it dealt with style switching.
Previsoly in some cases there were additional unwated spaces inside code lines. Co-authored-by: Albert Meltzer <7529386+kitbellew@users.noreply.github.com>
dos65
force-pushed
the
code_blocks_fix
branch
from
d57be51
to
33b9430
Compare
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.
Previsoly in some cases there were additional unwated spaces inside code
lines.