Skip to content

[5.1] Update with changes from master #145

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
merged 122 commits into from
Aug 17, 2019

Conversation

benlangmuir
Copy link
Contributor

Sync up with sourcekit-lsp master to get install support and recent bug fixes.

satishbabariya and others added 30 commits March 22, 2019 01:23
[vscode] Update dependency on vscode module
... to match the style of the other editor instructions.
…t-symbol

Implement document symbol request
Add instructions for Theia Cloud IDE
Add extra -Xcxx to docs, otherwise doesn't run command
Embrace Swift.Result in place SwiftPM.Basic.Result
benlangmuir and others added 25 commits August 8, 2019 22:22
…orts

Remove `@testable import` and `-enable-testing`
make project.json spec-compliant by removing a trailing comma
In preparation for looking for toolchain next to the sourcekit-lsp
binary, teach toolchain loading to find the info plist even if we are
using the path `Foo.xctoolchain/usr/bin` instead of `Foo.xctoolchain`.
When the ToolchainRegistry is used in code embedded into a toolchain, we
want to prefer that toolchain over any other search paths other than the
explicit SOURCEKIT_TOOLCHAIN_PATH environment.
When sourcekit-lsp is embedded inside a toolchain, use its main bundle
path as the install path to have the toolchain registry prefer that
toolcahin.
There is not guarantee that the toolchain.path contains `usr/bin`.
Instead, look at the diretory containing `swiftc`.
…lchain

 [sourcekit-lsp] Prefer containing toolchain if applicable
When invoked with the `install` action, build-script-helper.py will
rsync the produced sourcekit-lsp to the toolchain's bin directory. On
Linux, we add an extra relative rpath to find the swift corelibs
(unfotunately we currently have no way to remove the absolute rpath; the
same is true for all other swift-built binaries in the toolchain). On
macOS, we replace the rpath.
Swift-build was logging some extra information to stdout, causing
incorrect calculation of the bin dir.
Handy for local development if you don't want to test with swift's full
build.
 [build-script] Add installation support for sourcekit-lsp
Separate toolchain discovery from build settings
@benlangmuir
Copy link
Contributor Author

@benlangmuir benlangmuir merged commit dd0b724 into swiftlang:swift-5.1-branch Aug 17, 2019
@benlangmuir benlangmuir deleted the merge-51 branch August 17, 2019 03:08
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.

10 participants