[CursorInfo] Pass primary path to allow comparing previous ASTs #66907
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 please test |
rintaro
approved these changes
Jun 23, 2023
bnbarham
changed the title
|
@swift-ci please test |
bnbarham
commented
Jun 24, 2023
Comment on lines
-1432
to
+1435
| InputFile, /*IsRealpath=*/true)) | ||
| PrimaryFilePath, /*IsRealpath=*/true)) |
There was a problem hiding this comment.
This is the most significant change. InputFile is almost always empty, except in the case of generated buffers (eg. expanded macros). It should have been using the primary file path, which wasn't being passed in. So most of the change is just passing it to all the various callers.
Update the cursor requests to also pass in their primary file. Snapshots should be compared using this file, not the input buffer name. This fixes AST re-use when the AST is usable with snapshots. Resolves rdar://110344363.
bnbarham
commented
Jun 24, 2023
| // RUN: -req=cursor -offset=5 %t/func.swift -- %t/func.swift == \ | ||
| // RUN: -req=edit -offset=0 -length=0 -replace="// some comment\n" -req-opts=enablesyntaxmap=0,enablesubstructure=0,enablediagnostics=0 %t/func.swift -- %t/func.swift == \ | ||
| // RUN: -req=cursor -offset=21 %t/func.swift -- %t/func.swift | ||
| // RUN: -req=cursor -offset=5 %t/func.swift -- %t/func.swift |
There was a problem hiding this comment.
This just converts it back to before the previous PR.
|
@swift-ci please test |
|
@swift-ci Please test macOS |
rintaro
approved these changes
Jun 26, 2023
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.
Update the cursor requests to also pass in their primary file. Snapshots should be compared using this file, not the input buffer name. This fixes AST re-use when the AST is usable with snapshots.
Resolves rdar://110344363.