Skip to content

Merge main -> release/6.2 #2130

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 54 commits into from
May 2, 2025
Merged

Conversation

bnbarham
Copy link
Contributor

Periodic main -> release/6.2 merge.

DougGregor and others added 30 commits April 15, 2025 11:03
…iags-generalization

Generalize educational notes documentation test to not require the ".…md" suffix
…-notes-test

Improve educational-notes test
ahoppen and others added 20 commits April 23, 2025 11:55
Overview.md: Correct path to sourcekit-lsp logs
This way all dependencies on the `docc` libraries are wrapped inside the `DocCDocumentation` module.
… occurrence

The index refers to on-disk locations and since the cursor info below also operates on the on-disk contents, we should use the on-disk contents of the file to convert the symbol occurrence location to a `Position`.
The value isn’t needed here and the calls become cleaner if only the key is passed.
The exact sorting here should not matter and `<` is the standard choice here instead of `>=`, reducing distraction.
The function isn’t used anymore
This overload is no longer needed.
Add missing dependency declarations to Package.swift
Update launch configuration for Swift extension v2.2.0
…ntation

Handle Markdown and Tutorial files in textDocument/doccDocumentation
This sets formatting preferences automatically for editors that support this config file.
Fix logging docs for on-Apple platforms
…es-flag

Fix `experimentalFeatures` command line flag and description
@bnbarham bnbarham requested a review from ahoppen as a code owner April 29, 2025 21:01
@bnbarham bnbarham force-pushed the merge-main-20240429 branch from 9b39a46 to 682124a Compare April 29, 2025 21:03
@bnbarham bnbarham changed the base branch from main to release/6.2 April 29, 2025 21:06
@bnbarham bnbarham requested a review from a team as a code owner April 29, 2025 21:06
@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham bnbarham merged commit 9092459 into swiftlang:release/6.2 May 2, 2025
3 checks passed
@bnbarham bnbarham deleted the merge-main-20240429 branch May 2, 2025 00:10
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.

8 participants