Preserve language service when closing generated interface#2598
Open
edwardlee wants to merge 1 commit intoswiftlang:mainfrom
Open
Preserve language service when closing generated interface#2598edwardlee wants to merge 1 commit intoswiftlang:mainfrom
edwardlee wants to merge 1 commit intoswiftlang:mainfrom
Conversation
edwardlee
requested review from
ahoppen,
hamishknight and
rintaro
as code owners
Member
|
Good find, thanks! Could you add a test case that fails without this change? |
Member
|
On second thought, what if the documentManager document is closed first while the related generated interfaces are still open? Do they lose the language service? |
Closing a generated interface document (sourcekit-lsp:// URI) was removing the language service for the originating source file because both share the same buildSettingsFile key. Guard the removal so it only happens when no other open document shares that key. Relates to swiftlang#2209
edwardlee
force-pushed
the
handle-interface-close
branch
from
30d1d29 to
0c3a2f9
Compare
Author
|
Added test similar to testNoDiagnosticsInGeneratedInterface. Since the logic checks for any remaining open file with the key before shutting down LSP, both cases work. Tying to the uri makes sense, this was just simpler. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Closing a generated interface was removing the language service for the originating file because both share the same buildSettingsFile key. https://github.com/swiftlang/sourcekit-lsp/blob/main/Sources/SourceKitLSP/ReferenceDocumentURL.swift#L125
Guard the removal by when no other open document shares that key.
See #2209 and 7437d92