Skip to content

Merge main into release/6.2 #2162

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.

Sign up for GitHub

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 21 commits into from
May 22, 2025
Merged

Merge main into release/6.2 #2162

Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
69ab356
Log contextual requests that affect sourcekitd’s global state
ahoppen Mar 27, 2025
da90f34
Add contextual request support to `sourcekit-lsp diagnose`
ahoppen Mar 27, 2025
d63419d
Address review comments
ahoppen May 12, 2025
385f8ae
Resolve paths passed in the SwiftPM configuration to the project root
bnbarham May 13, 2025
6e09a21
Log the path that SourceKit-LSP was launched from
ahoppen May 7, 2025
47a940d
Fix race condition that causes task cancellation to be missed in `Tas…
ahoppen May 13, 2025
ba1fb5d
Do not schedule any new tasks in `TaskScheduler` if it has been shut …
ahoppen May 13, 2025
8797f9c
Fix Package.swift warnings
Wilfred May 13, 2025
f3153ba
Merge pull request #2140 from ahoppen/log-launch-path
ahoppen May 13, 2025
a78bc5e
Merge pull request #2152 from ahoppen/cancellation-missed
ahoppen May 14, 2025
be5ae8c
Merge pull request #2153 from ahoppen/check-shutdown
ahoppen May 14, 2025
188e174
Merge pull request #2094 from ahoppen/contextual-sourcekitd-request
ahoppen May 14, 2025
f65bb76
Add more code owners
bnbarham May 14, 2025
8e8016e
Merge pull request #2150 from bnbarham/relative-swiftpm-paths
bnbarham May 14, 2025
a909439
Pass `cancelOnSubsequentRequest: 0` to all requests that support it
ahoppen May 14, 2025
66b20b9
Merge pull request #2159 from bnbarham/update-codeowners
ahoppen May 15, 2025
8a908f2
Pass `hostToolchainBinDir` to `SwiftSDKBundleStore` (#2157)
MaxDesiatov May 15, 2025
efe4836
Merge pull request #2158 from ahoppen/no-cancel-on-subsequent-request
ahoppen May 19, 2025
c6ed68a
Merge pull request #2154 from Wilfred/fix_package_warnings
bnbarham May 19, 2025
020ca39
Revert "Merge pull request #2159 from bnbarham/update-codeowners"
bnbarham May 19, 2025
a0a8f1e
Revert "Merge pull request #2094 from ahoppen/contextual-sourcekitd-r…
bnbarham May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ var targets: [Target] = [
.product(name: "SwiftDocC", package: "swift-docc"),
.product(name: "SymbolKit", package: "swift-docc-symbolkit"),
],
exclude: ["CMakeLists.txt"],
exclude: [],
swiftSettings: globalSwiftSettings
),

Expand Down Expand Up @@ -808,7 +808,7 @@ var dependencies: [Package.Dependency] {
.package(url: "https://github.com/swiftlang/swift-docc.git", branch: relatedDependenciesBranch),
.package(url: "https://github.com/swiftlang/swift-docc-symbolkit.git", branch: relatedDependenciesBranch),
.package(url: "https://github.com/swiftlang/swift-markdown.git", branch: relatedDependenciesBranch),
.package(url: "https://github.com/apple/swift-tools-support-core.git", branch: relatedDependenciesBranch),
.package(url: "https://github.com/swiftlang/swift-tools-support-core.git", branch: relatedDependenciesBranch),
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
.package(url: "https://github.com/swiftlang/swift-syntax.git", branch: relatedDependenciesBranch),
.package(url: "https://github.com/apple/swift-crypto.git", from: "3.0.0"),
Expand Down