Skip to content

[NFC][CursorInfo] Temporarily disable some doc comment check lines #58719

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

Merged
merged 1 commit into from
May 10, 2022

Conversation

zixu-w
Copy link
Contributor

@zixu-w zixu-w commented May 6, 2022

Pull request swiftlang/llvm-project#4442 brings in a change to
RawComment::getFormattedText that removes spurious new lines
and whitespaces at the end of block comments. It breaks the
cursor_symbol_graph_objc test which is assuming the old behavior.
Temporarily disable the relevant check lines in the test to merge the
llvm change, and then fix the test properly and switch to the new
getFormattedLines in SymbolGraphGen.

Pull request swiftlang/llvm-project#4442 brings in a change to
`RawComment::getFormattedText` that removes spurious new lines
and whitespaces at the end of block comments. It breaks the
`cursor_symbol_graph_objc` test which is assuming the old behavior.
Temporarily disable the relevant check lines in the test to merge the
llvm change, and then fix the test properly and switch to the new
`getFormattedLines` in SymbolGraphGen.
@bnbarham
Copy link
Contributor

bnbarham commented May 6, 2022

There's quite a bit of cherry-picking that will be required at the moment :(
swift main corresponds to stable/20211026
swift release/5.7 corresponds to swift/release/5.7
and I'm currently working on the rebranch where main will eventually switch to stable/20220421 (currently rebranch corresponds to stable/20220421)

TLDR: You'll want this change in main and release/5.7 + the LLVM change in swift/release/5.7 (which auto merges to stable/20211026). main is automerged to rebranch so we'll also need the LLVM change in stable/20220421, but I can handle that if needed.

@zixu-w
Copy link
Contributor Author

zixu-w commented May 6, 2022

@swift-ci Please smoke test

@zixu-w
Copy link
Contributor Author

zixu-w commented May 7, 2022

Linux test failed with git clone errors... Trying again
@swift-ci Please smoke test Linux platform

@zixu-w zixu-w merged commit 4aa20e9 into swiftlang:main May 10, 2022
@zixu-w zixu-w deleted the fix/disable-test-for-llvm branch May 10, 2022 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants