-
Notifications
You must be signed in to change notification settings - Fork 238
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
Merge main
into release/6.0
#760
Merged
ahoppen
merged 21 commits into
swiftlang:release/6.0
from
ahoppen:6.0/cherry-pick-2024-06-27
Jun 27, 2024
Merged
Merge main
into release/6.0
#760
ahoppen
merged 21 commits into
swiftlang:release/6.0
from
ahoppen:6.0/cherry-pick-2024-06-27
Jun 27, 2024
Conversation
This file contains 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
…ftlang#297>. The basic idea here is to insert `enableFormatting` and `disableFormatting` tokens into the print stream when we enter or leave the selection. When formatting is enabled, we print out the tokens as usual. When formatting is disabled, we turn off any output until the next `enableFormatting` token. When that token is hit, we write the original source text from the location of the last `disableFormatting` to the current location. Note that this means that all the APIs need the original source text to be passed in. A `Selection` is represented as an enum with an `.infinite` case, and a `.ranges` case to indicate either selecting the entire file, or an array of start/end utf-8 offsets. The offset pairs are given with `Range<AbsolutePosition>`, matching the (now common) usage in swift-syntax. For testing, allow marked text to use `⏩` and `⏪` to deliniate the start/end of a range of a selection. The command line now takes an `--offsets` option of comma-separated "start:end" pairs to set the selection for formatting.
…ore test cases. For formatting a selection (<swiftlang#297>).
… support passing multiple of them.
Pretty-print the `@_expose` with the correct spacing. It was formatted as `@_expose(wasm,"foo")` instead of `@_expose(wasm, "foo")`.
Support for formatting a selection
…e-attribute Fix `@_expose` attribute argument spacing
…indentation Handle indented block comments with ASCII art correctly.
deleting in favor of the organization wide coc; this file present means that the repo is opt-ing out of that
contains old language; moving towards a unified strategy with CONTRIBUTING files.
adding in a contribution section from the removal of the contributing.md file
Delete CODE_OF_CONDUCT.md
Update README.md
Delete CONTRIBUTING.md
Update links for repositories moved to the swiftlang org on GitHub
Update README.md to mention that swift-format is included in Xcode 16
add support for riscv64
# Conflicts: # CMakeLists.txt # Package.swift
This was referenced Jun 27, 2024
bnbarham
approved these changes
Jun 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge the following PRs into
release/6.0
:@_expose
attribute argument spacing #750