Skip to content

[6.2] [SourceKit] Properly handle cursor info range for macro expansions #81845

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

Conversation

hamishknight
Copy link
Contributor

6.2 cherry-pick of #81809

  • Explanation: Fixes an issue where cursor info would report an incorrect range length for a macro expansion decl when highlighting the macro in the outer buffer
  • Scope: Affects cursor info
  • Issue: rdar://151411756
  • Risk: Low, only affects cursor info
  • Testing: Added tests to test suite
  • Reviewer: Ben Barham

Make `getOriginalLocation` work with source ranges, and adjust the
cursor info logic to map the range into the original buffer. This
fixes the case where we were using bogus range lengths for macro
expansion decls.

rdar://151411756
@hamishknight hamishknight requested a review from bnbarham May 29, 2025 19:53
@hamishknight hamishknight requested a review from a team as a code owner May 29, 2025 19:53
@hamishknight hamishknight added 🍒 release cherry pick Flag: Release branch cherry picks swift 6.2 labels May 29, 2025
@hamishknight
Copy link
Contributor Author

@swift-ci please test

@hamishknight hamishknight merged commit fbd2b8d into swiftlang:release/6.2 May 30, 2025
5 checks passed
@hamishknight hamishknight deleted the range-expansion-6.2 branch May 30, 2025 09:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍒 release cherry pick Flag: Release branch cherry picks swift 6.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants