Skip to content

Merge main into release/6.1 #904

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 8 commits into from
Dec 18, 2024
Merged

Merge main into release/6.1 #904

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6cb2c76
Document default config values
rauhul Dec 13, 2024
2e588a0
Merge pull request #899 from rauhul/rauhul/config-docs
ahoppen Dec 13, 2024
f384f62
Add Swift package index
kimdv Dec 13, 2024
dba874b
Fix documentation
kimdv Dec 14, 2024
239ffcb
Merge pull request #900 from kimdv/kimdv/add-swift-package-index
ahoppen Dec 15, 2024
72123e5
Bump to Swift 5.8 for tool version
kimdv Dec 16, 2024
cd042df
Merge pull request #903 from kimdv/kimdv/update-to-swift-5.8
ahoppen Dec 17, 2024
8c7b261
Merge remote-tracking branch 'swiftlang/main' into release/6.1
ahoppen Dec 17, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix documentation
  • Loading branch information
@kimdv
kimdv committed Dec 14, 2024
commit dba874b4af371ea1e9030bfd040d2854cb45e7a3
4 changes: 2 additions & 2 deletions Sources/SwiftFormat/API/SwiftFormatter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public final class SwiftFormatter {
/// This form of the `format` function automatically folds expressions using the default operator
/// set defined in Swift. If you need more control over this—for example, to provide the correct
/// precedence relationships for custom operators—you must parse and fold the syntax tree
/// manually and then call ``format(syntax:assumingFileURL:to:)``.
/// manually and then call ``format(syntax:source:operatorTable:assumingFileURL:selection:to:)``.
///
/// - Parameters:
/// - url: The URL of the file containing the code to format.
Expand Down Expand Up @@ -81,7 +81,7 @@ public final class SwiftFormatter {
/// This form of the `format` function automatically folds expressions using the default operator
/// set defined in Swift. If you need more control over this—for example, to provide the correct
/// precedence relationships for custom operators—you must parse and fold the syntax tree
/// manually and then call ``format(syntax:assumingFileURL:to:)``.
/// manually and then call ``format(syntax:source:operatorTable:assumingFileURL:selection:to:)``.
///
/// - Parameters:
/// - source: The Swift source code to be formatted.
Expand Down
5 changes: 3 additions & 2 deletions Sources/SwiftFormat/API/SwiftLinter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public final class SwiftLinter {
/// This form of the `lint` function automatically folds expressions using the default operator
/// set defined in Swift. If you need more control over this—for example, to provide the correct
/// precedence relationships for custom operators—you must parse and fold the syntax tree
/// manually and then call ``lint(syntax:assumingFileURL:)``.
/// manually and then call ``lint(syntax:source:operatorTable:assumingFileURL:)``.
///
/// - Parameters:
/// - url: The URL of the file containing the code to format.
Expand Down Expand Up @@ -76,7 +76,7 @@ public final class SwiftLinter {
/// This form of the `lint` function automatically folds expressions using the default operator
/// set defined in Swift. If you need more control over this—for example, to provide the correct
/// precedence relationships for custom operators—you must parse and fold the syntax tree
/// manually and then call ``lint(syntax:assumingFileURL:)``.
/// manually and then call ``lint(syntax:source:operatorTable:assumingFileURL:)``.
///
/// - Parameters:
/// - source: The Swift source code to be linted.
Expand Down Expand Up @@ -124,6 +124,7 @@ public final class SwiftLinter {
///
/// - Parameters:
/// - syntax: The Swift syntax tree to be converted to be linted.
/// - source: The Swift source code to be linted.
/// - operatorTable: The table that defines the operators and their precedence relationships.
/// This must be the same operator table that was used to fold the expressions in the `syntax`
/// argument.
Expand Down
Loading