Add commentValue property to Trivia for cleaned comments
#2966
Conversation
- Copied changes from PR swiftlang#2578 (swiftlang#2578) - Original work by @adammcarter - Manual copy due to inaccessible original branch
zyadtaha
force-pushed
the
trivia-piece-comment-value
branch
from
3ad450f to
c23e3dc
Compare
|
Thanks for the feedback, @ahoppen! I've addressed the comments—let me know if anything else needs attention. |
Add release note for Trivia.commentValue Address PR review Address second review
zyadtaha
force-pushed
the
trivia-piece-comment-value
branch
from
c23e3dc to
04f700e
Compare
|
Hey @ahoppen, just wanted to check if there's anything else needed from my side on this PR. Let me know if you have any concerns. Thanks! |
Sources/SwiftSyntax/Trivia.swift
Outdated
| text.hasPrefix("/*\n") | ||
| ? processMultilineBlockComment(text) | ||
| : processBlockComment(text, prefix: "/*", suffix: "*/") |
There was a problem hiding this comment.
I don’t think we need a general distinction here. Say if you have
/* abc
def
ghi
*/
We should still be able to strip the indentation. We just need to exclude the first line from the indentation stripping.
There was a problem hiding this comment.
But even if we exclude the first line from indentation stripping, wouldn't the minimum indentation still be 3 due to the last line? That would result in:
abc
def
ghi
Maybe we should consider excluding the last line from indentation stripping as well?
|
Hey @ahoppen, I've pushed my updates. For your last two comments, I've added responses—let me know your feedback when you get a chance. Thanks! |
zyadtaha
force-pushed
the
trivia-piece-comment-value
branch
from
8df001d to
52fdc83
Compare
| } | ||
| } | ||
|
|
||
| return (Swift.min(currentMin.0, spaceCount), Swift.min(currentMin.1, tabCount)) |
There was a problem hiding this comment.
I think this doesn’t work if you have one line that contains a space as indentation and another one that only contains a tab as indentation.
There was a problem hiding this comment.
In this case:
/* comment
\tcomment*/
The minIndentation would be 1 because it only starts checking from the second line, which contains a tab. Since the first line is ignored during trimming if it contains the /*, the output would be:
comment
comment
But in this case:
/*
comment
\tcomment*/
The minIndentation would be 0, as expected, and the output would be:
comment
\tcomment
If we want both cases to produce consistent output, maybe we could insert a \n after the /* if it's not already present, to ensure that minIndentation is 0. What do you think?
This PR continues the work from #2578, addressing the review comments and refining the behavior of
Trivia.commentValue.