[6.0] Merge changes from main
#1171
Merged
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
Previously, we `fatalError`ing when `JSONDecoder` failed to decode a message from the client. Instead of crashing, try recovering from such invalid messages as best as possible. If we know that the state might have gotten out of sync with the client, show a notification message to the user, asking them to file an issue. rdar://112991102
…message-has-missing-field Don’t crash sourcekit-lsp if a known message is missing a field
…ubsequent lines when expanding trailing closures Visual Studio Code automatically inserts the indentation of the current line to any additional lines from code completion. rdar://125071836
…s the position from which the rename was initiated
VS Code rejects the placeholder name returned by the `PrepareRenameRequest`. When initiating rename on `x` in the following, this means that VS Code picks its own internal symbol name as the placeholder text, opening the rename textbox with `x`.
```swift
func foo(
x: Int
) {}
```
Users then enter `y` in the expectation to rename only the parameter but sourcekit-lsp expects a function name and thus renames `foo` to `y(x:)`, which is unexpected.
rdar://125551489
rdar://124727045
…onverted to a `SourceEdit`
…that exceeds past the document
…contain-originator-range Make sure the range returned by `PrepareRenameRequest` always contains the position from which the rename was initiated
…ntifier Support rename initiated from the end of an identifier
…d-closure Don’t add the indentation of the current line to the insert text of subsequent lines when expanding trailing closures
Fix a couple of bugs with progress reporting in the source reducer
Instead of logging errors in position translation ad-hoc at the caller’s side (and ofter forgetting to do so), log these errors in `LineTable`. To be able to debug where the position conversion error is coming from, also log the file name and line number of the caller. rdar://125545620
Replace usages of `fatalError` that are recoverable by non-fatal error propagation constructs
…ion-error-logging Unify logging of errors during position conversions
|
@swift-ci Please test |
bnbarham
approved these changes
Apr 9, 2024
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.
Cherry-pick the following PRs to release/6.0:
fatalErrorthat are recoverable by non-fatal error propagation constructs #1162PrepareRenameRequestalways contains the position from which the rename was initiated #1163