Redo the Folding Range Request on top of the Syntax Tree #652
Conversation
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
|
@swift-ci test |
ahoppen
reviewed
Oct 17, 2022
CodaFi
force-pushed
the
folderol
branch
3 times, most recently
from
eee1726 to
1139c22
Compare
Building upon the infrastructure that requests the lexical structure of the document from SwiftSyntax, redo the folding ranges request using the tree directly. This corrects a number of inconsistencies in the tests mostly due to incorrect SourceLocations in the semantic ASTs and the line comment merging logic.
|
@swift-ci test |
ahoppen
approved these changes
Oct 20, 2022
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.
Building upon the infrastructure that requests the lexical structure of the document from SwiftSyntax, redo the folding ranges request using the tree directly. This corrects a number of inconsistencies in the tests mostly due to incorrect SourceLocations in the semantic ASTs and the line comment merging logic.
To extract folding ranges, we were previously opening a temporary document to issue a syntactic structure request to SourceKit.
This change is not NFC - there are a number of quirks of the C++ version of the structure walkers that I think were incorrect and are fixed here. For example, the folding range for the
guardin the FoldingRangeBase test occurs before the actual{! However, this PR does try to recreate the adjacent line comment merging behavior in the C++, but does also correct some bogus source ranges as a result.Built upon #651