-
Notifications
You must be signed in to change notification settings - Fork 439
Add commentValue
property to Trivia
for cleaned comments
#2966
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.
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
Open
zyadtaha
wants to merge
6
commits into
swiftlang:main
Choose a base branch
from
zyadtaha:trivia-piece-comment-value
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
085f207
Add Trivia.commentValues from @adammcarter
zyadtaha 04f700e
Enhance comment trimming and update test cases
zyadtaha 16c2183
Merge branch 'main' into trivia-piece-comment-value
zyadtaha 312bbc9
Address third review
zyadtaha 52fdc83
Address fourth review
zyadtaha 2197103
Adjust PR to address comments I raised in PR feedback and address oth…
ahoppen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,143 @@ | ||
//===----------------------------------------------------------------------===// | ||
// | ||
// This source file is part of the Swift.org open source project | ||
// | ||
// Copyright (c) 2014 - 2025 Apple Inc. and the Swift project authors | ||
// Licensed under Apache License v2.0 with Runtime Library Exception | ||
// | ||
// See https://swift.org/LICENSE.txt for license information | ||
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
extension Trivia { | ||
/// The contents of all the comment pieces with any comments markers removed and indentation whitespace stripped. | ||
public var commentValue: String? { | ||
var comments: [Substring] = [] | ||
|
||
/// Keep track of whether we have seen a line or block comment trivia piece. If this `Trivia` contains both a block | ||
/// and a line comment, we don't know how to concatenate them to form the comment value and thus default to | ||
/// returning `nil`. | ||
var hasBlockComment = false | ||
var hasLineComment = false | ||
|
||
// Determine if all line comments have a space separating the `//` or `///` comment marker and the actual comment. | ||
lazy var allLineCommentsHaveSpace: Bool = pieces.allSatisfy { piece in | ||
switch piece { | ||
case .lineComment(let text): return text.hasPrefix("// ") | ||
case .docLineComment(let text): return text.hasPrefix("/// ") | ||
default: return true | ||
} | ||
} | ||
|
||
// Strips /* */ markers and remove any common indentation between the lines in the block comment. | ||
func processBlockComment(_ text: String, isDocComment: Bool) -> String? { | ||
var lines = text.dropPrefix(isDocComment ? "/**" : "/*").dropSuffix("*/") | ||
.split(omittingEmptySubsequences: false, whereSeparator: \.isNewline) | ||
|
||
// If the comment content starts on the same line as the `/*` marker or ends on the same line as the `*/` marker, | ||
// it is common to separate the marker and the actual comment using spaces. Strip those spaces if they exists. | ||
// If there are non no-space characters on the first / last line, then the comment doesn't start / end on the line | ||
// with the marker, so don't do the stripping. | ||
if let firstLine = lines.first, firstLine.contains(where: { $0 != " " }) { | ||
lines[0] = firstLine.drop { $0 == " " } | ||
} | ||
if let lastLine = lines.last, lastLine.contains(where: { $0 != " " }) { | ||
lines[lines.count - 1] = lastLine.dropLast { $0 == " " } | ||
} | ||
|
||
var indentation: Substring? = nil | ||
// Find the lowest indentation that is common among all lines in the block comment. Do not consider the first line | ||
// because it won't have any indentation since it starts with /* | ||
for line in lines.dropFirst() { | ||
let lineIndentation = line.prefix(while: { $0 == " " || $0 == "\t" }) | ||
guard let previousIndentation = indentation else { | ||
indentation = lineIndentation | ||
continue | ||
} | ||
indentation = commonPrefix(previousIndentation, lineIndentation) | ||
} | ||
|
||
guard let firstLine = lines.first else { | ||
// We did not have any lines. This should never happen in practice because `split` never returns an empty array | ||
// but be safe and return `nil` here anyway. | ||
return nil | ||
} | ||
|
||
var unindentedLines = [firstLine] + lines.dropFirst().map { $0.dropPrefix(indentation ?? "") } | ||
|
||
// If the first line only contained the comment marker, don't include it. We don't want to start the comment value | ||
// with a newline if `/*` is on its own line. Same for the end marker. | ||
if unindentedLines.first?.allSatisfy({ $0 == " " }) ?? false { | ||
unindentedLines.removeFirst() | ||
} | ||
if unindentedLines.last?.allSatisfy({ $0 == " " }) ?? false { | ||
unindentedLines.removeLast() | ||
} | ||
// We canonicalize the line endings to `\n` here. This matches how we concatenate the different line comment | ||
// pieces using \n as well. | ||
return unindentedLines.joined(separator: "\n") | ||
} | ||
|
||
for piece in pieces { | ||
switch piece { | ||
case .blockComment(let text), .docBlockComment(let text): | ||
if hasBlockComment || hasLineComment { | ||
return nil | ||
} | ||
hasBlockComment = true | ||
guard let processedText = processBlockComment(text, isDocComment: piece.isDocComment) else { | ||
return nil | ||
} | ||
comments.append(processedText[...]) | ||
case .lineComment(let text), .docLineComment(let text): | ||
if hasBlockComment { | ||
return nil | ||
} | ||
hasLineComment = true | ||
let prefixToDrop = (piece.isDocComment ? "///" : "//") + (allLineCommentsHaveSpace ? " " : "") | ||
comments.append(text.dropPrefix(prefixToDrop)) | ||
default: | ||
break | ||
} | ||
} | ||
|
||
if comments.isEmpty { return nil } | ||
|
||
return comments.joined(separator: "\n") | ||
} | ||
} | ||
|
||
fileprivate extension StringProtocol where SubSequence == Substring { | ||
func dropPrefix(_ prefix: some StringProtocol) -> Substring { | ||
if self.hasPrefix(prefix) { | ||
return self.dropFirst(prefix.count) | ||
} | ||
return self[...] | ||
} | ||
|
||
func dropSuffix(_ suffix: some StringProtocol) -> Substring { | ||
if self.hasSuffix(suffix) { | ||
return self.dropLast(suffix.count) | ||
} | ||
return self[...] | ||
} | ||
|
||
func dropLast(while predicate: (Self.Element) -> Bool) -> Self.SubSequence { | ||
let dropLength = self.reversed().prefix(while: predicate) | ||
return self.dropLast(dropLength.count) | ||
} | ||
} | ||
|
||
fileprivate func commonPrefix(_ lhs: Substring, _ rhs: Substring) -> Substring { | ||
return lhs[..<lhs.index(lhs.startIndex, offsetBy: zip(lhs, rhs).prefix { $0 == $1 }.count)] | ||
} | ||
|
||
fileprivate extension TriviaPiece { | ||
var isDocComment: Bool { | ||
switch self { | ||
case .docBlockComment, .docLineComment: return true | ||
default: return false | ||
} | ||
} | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here we allow
resulting
"Foo Bar\nThis is a doc-comment\n@_spi(Testing)"
, but notNot sure about this case.