Update for apple/swift#29619 #712
Merged
Conversation
This file contains 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 |
hamishknight
changed the title
|
@swift-ci please test |
marcrasi
pushed a commit
to marcrasi/llvm-project
that referenced
this pull request
Feb 6, 2020
marcrasi
pushed a commit
to marcrasi/llvm-project
that referenced
this pull request
Feb 7, 2020
marcrasi
pushed a commit
that referenced
this pull request
Feb 7, 2020
…fix-to-tensorflow This is the main PR fixing https://bugs.swift.org/browse/SR-12076 in swift-jupyter. There are three parts to the fix: * A PR into apple/swift cherry-picking fixes apple/swift#29619 and apple/swift#29664 from master: apple/swift#29707. * This PR cherry-picks the #712 fix from apple:swift/master llvm-project. * This PR also makes additional fixes in SwiftCodeCompletion.cpp, which is a custom thing in the `tensorflow` branch of llvm-project. **Background on SwiftCodeCompletion.cpp** The existing REPL code completion implementation ([REPLCodeCompletion.cpp](https://github.com/apple/swift/blob/167fea2c78ba334c8248dc05d32e50ccb848122f/lib/IDE/REPLCodeCompletion.cpp)) had some problems making it unsuitable for implementing code completion in swift-jupyter: * It didn't handle redeclarations correctly. * It didn't have an API that was callable from Python. So I duplicated it into `SwiftCodeCompletion.cpp` and made improvements. I'm planning to upstream these improvements soon so that we don't have this duplicate implementation, but for now we have it. Whenever someone makes an important change in `REPLCodeCompletion.cpp`, we need to make the corresponding change in `SwiftCodeCompletion.cpp`. **This PR's fixes to SwiftCodeCompletion.cpp** apple/swift#29664 fixes https://bugs.swift.org/browse/SR-12076 for `REPLCodeCompletion.cpp` by changing it from reusing an existing source file to creating a new source file for every completion request. So this PR makes a corresponding change in `SwiftCodeCompletion.cpp`, making it create new source files for every request. This actually simplifies the logic in `SwiftCodeCompletion.cpp` quite a lot, because we don't have to deal with existing state in the files. Also, while making this change, I noticed that `SwiftCodeCompletion.cpp` wastefully parsed and typechecked a file merely to calculate the completion offset (see explanation in doc comment `FindCompletionPrefixOffset` for explanation of what completion offset it). So I switched it to calculate the completion offset by looking at the characters, inspired by logic in [sourcekit-lsp](https://github.com/apple/sourcekit-lsp/blob/9b8e4c714651ac56dea4c268650b7e68fb918814/Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift#L537).
marcrasi
pushed a commit
to marcrasi/llvm-project
that referenced
this pull request
Feb 7, 2020
…lete-fix-to-tensorflow This is the main PR fixing https://bugs.swift.org/browse/SR-12076 in swift-jupyter. There are three parts to the fix: * A PR into apple/swift cherry-picking fixes apple/swift#29619 and apple/swift#29664 from master: apple/swift#29707. * This PR cherry-picks the apple#712 fix from apple:swift/master llvm-project. * This PR also makes additional fixes in SwiftCodeCompletion.cpp, which is a custom thing in the `tensorflow` branch of llvm-project. **Background on SwiftCodeCompletion.cpp** The existing REPL code completion implementation ([REPLCodeCompletion.cpp](https://github.com/apple/swift/blob/167fea2c78ba334c8248dc05d32e50ccb848122f/lib/IDE/REPLCodeCompletion.cpp)) had some problems making it unsuitable for implementing code completion in swift-jupyter: * It didn't handle redeclarations correctly. * It didn't have an API that was callable from Python. So I duplicated it into `SwiftCodeCompletion.cpp` and made improvements. I'm planning to upstream these improvements soon so that we don't have this duplicate implementation, but for now we have it. Whenever someone makes an important change in `REPLCodeCompletion.cpp`, we need to make the corresponding change in `SwiftCodeCompletion.cpp`. **This PR's fixes to SwiftCodeCompletion.cpp** apple/swift#29664 fixes https://bugs.swift.org/browse/SR-12076 for `REPLCodeCompletion.cpp` by changing it from reusing an existing source file to creating a new source file for every completion request. So this PR makes a corresponding change in `SwiftCodeCompletion.cpp`, making it create new source files for every request. This actually simplifies the logic in `SwiftCodeCompletion.cpp` quite a lot, because we don't have to deal with existing state in the files. Also, while making this change, I noticed that `SwiftCodeCompletion.cpp` wastefully parsed and typechecked a file merely to calculate the completion offset (see explanation in doc comment `FindCompletionPrefixOffset` for explanation of what completion offset it). So I switched it to calculate the completion offset by looking at the characters, inspired by logic in [sourcekit-lsp](https://github.com/apple/sourcekit-lsp/blob/9b8e4c714651ac56dea4c268650b7e68fb918814/Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift#L537).
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.
No description provided.