Skip to content

Make the LanguageServerProtocol module dependency-free #945

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

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Oct 27, 2023

Shuffle a few types around so that the LanguageServerProtocol has no more dependencies.

Fixes #938
rdar://117565087

@ahoppen ahoppen requested a review from benlangmuir as a code owner October 27, 2023 17:33
@ahoppen ahoppen force-pushed the ahoppen/language-server-protocol-dependency-free branch from f1f329e to f6bce95 Compare October 27, 2023 17:37
Comment on lines 35 to 44
extension DocumentURI: CustomLogStringConvertible {
public var redactedDescription: String {
return "<DocumentURI length=\(description.count) hash=\(description.hashForLogging)>"
}
}

// MARK: - RequestType

fileprivate struct AnyRequestType: CustomLogStringConvertible {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW SE-0364 will eventually require these to be marked @retroactive since they're conformances of external types to external protocols

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I need to address these warnings across the entire codebase. I’ll probably create a PR in the next week or so when I get annoyed by the warnings again.

@ahoppen ahoppen force-pushed the ahoppen/language-server-protocol-dependency-free branch from f6bce95 to ecb2bf6 Compare October 31, 2023 15:32
@ahoppen ahoppen changed the title Make the LanguageServerProtocol module dependency-free 🚥 #937 Make the LanguageServerProtocol module dependency-free Oct 31, 2023
@ahoppen
Copy link
Member Author

ahoppen commented Oct 31, 2023

@swift-ci Please test

Shuffle a few types around so that the `LanguageServerProtocol` has no more dependencies.

Fixes swiftlang#938
rdar://117565087
@ahoppen ahoppen force-pushed the ahoppen/language-server-protocol-dependency-free branch from ecb2bf6 to aa70fc0 Compare October 31, 2023 20:22
@ahoppen
Copy link
Member Author

ahoppen commented Oct 31, 2023

@swift-ci Please test

@ahoppen
Copy link
Member Author

ahoppen commented Oct 31, 2023

@swift-ci Please test Windows

2 similar comments
@ahoppen
Copy link
Member Author

ahoppen commented Oct 31, 2023

@swift-ci Please test Windows

@ahoppen
Copy link
Member Author

ahoppen commented Oct 31, 2023

@swift-ci Please test Windows

@ahoppen ahoppen merged commit 9a87691 into swiftlang:main Oct 31, 2023
@ahoppen ahoppen deleted the ahoppen/language-server-protocol-dependency-free branch October 31, 2023 23:02
@compnerd
Copy link
Member

compnerd commented Nov 1, 2023

This seems to have broken the Windows build :/
https://github.com/thebrowsercompany/swift-build/actions/runs/6713902243/job/18247898012

compnerd added a commit to compnerd/sourcekit-lsp that referenced this pull request Nov 1, 2023
The changes in swiftlang#945 changed the dependencies but did not correct them in
the CMakeLists.txt resulting in a broken build.
compnerd added a commit to compnerd/sourcekit-lsp that referenced this pull request Nov 1, 2023
The changes in swiftlang#945 changed the dependencies but did not correct them in
the CMakeLists.txt resulting in a broken build.  Resynchronise the
dependencies across Package.swift and CMake.
compnerd added a commit to compnerd/sourcekit-lsp that referenced this pull request Nov 1, 2023
The changes in swiftlang#945 changed the dependencies but did not correct them in
the CMakeLists.txt resulting in a broken build.  Resynchronise the
dependencies across Package.swift and CMake.
compnerd added a commit that referenced this pull request Nov 1, 2023
The changes in #945 changed the dependencies but did not correct them in
the CMakeLists.txt resulting in a broken build.  Resynchronise the
dependencies across Package.swift and CMake.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove dependency of LanguageServerProtocol on TSC
3 participants