Skip to content

Commit 65e19dd

Browse files
committed
Consolidate SwiftFormat{Core,PrettyPrint,Rules,WhitespaceLinter} modules into SwiftFormat.
This only moves files and updated imports; access level changes and SPIs will be introduced later.
1 parent 7c53d2c commit 65e19dd

File tree

132 files changed

+61
-186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+61
-186
lines changed

Package.swift

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,7 @@ let package = Package(
5050
name: "SwiftFormat",
5151
dependencies: [
5252
"SwiftFormatConfiguration",
53-
"SwiftFormatCore",
54-
"SwiftFormatPrettyPrint",
55-
"SwiftFormatRules",
56-
"SwiftFormatWhitespaceLinter",
53+
.product(name: "Markdown", package: "swift-markdown"),
5754
.product(name: "SwiftSyntax", package: "swift-syntax"),
5855
.product(name: "SwiftOperators", package: "swift-syntax"),
5956
.product(name: "SwiftParser", package: "swift-syntax"),
@@ -63,43 +60,10 @@ let package = Package(
6360
.target(
6461
name: "SwiftFormatConfiguration"
6562
),
66-
.target(
67-
name: "SwiftFormatCore",
68-
dependencies: [
69-
"SwiftFormatConfiguration",
70-
.product(name: "Markdown", package: "swift-markdown"),
71-
.product(name: "SwiftOperators", package: "swift-syntax"),
72-
.product(name: "SwiftSyntax", package: "swift-syntax"),
73-
]
74-
),
75-
.target(
76-
name: "SwiftFormatRules",
77-
dependencies: [
78-
"SwiftFormatCore",
79-
"SwiftFormatConfiguration",
80-
.product(name: "Markdown", package: "swift-markdown"),
81-
]
82-
),
83-
.target(
84-
name: "SwiftFormatPrettyPrint",
85-
dependencies: [
86-
"SwiftFormatCore",
87-
"SwiftFormatConfiguration",
88-
.product(name: "SwiftOperators", package: "swift-syntax"),
89-
]
90-
),
91-
.target(
92-
name: "SwiftFormatWhitespaceLinter",
93-
dependencies: [
94-
"SwiftFormatCore",
95-
.product(name: "SwiftSyntax", package: "swift-syntax"),
96-
]
97-
),
9863
.target(
9964
name: "_SwiftFormatTestSupport",
10065
dependencies: [
101-
"SwiftFormatCore",
102-
"SwiftFormatRules",
66+
"SwiftFormat",
10367
"SwiftFormatConfiguration",
10468
.product(name: "SwiftOperators", package: "swift-syntax"),
10569
]
@@ -133,8 +97,7 @@ let package = Package(
13397
.executableTarget(
13498
name: "generate-pipeline",
13599
dependencies: [
136-
"SwiftFormatCore",
137-
"SwiftFormatRules",
100+
"SwiftFormat",
138101
.product(name: "SwiftSyntax", package: "swift-syntax"),
139102
.product(name: "SwiftParser", package: "swift-syntax"),
140103
]
@@ -144,7 +107,6 @@ let package = Package(
144107
dependencies: [
145108
"SwiftFormat",
146109
"SwiftFormatConfiguration",
147-
"SwiftFormatCore",
148110
.product(name: "ArgumentParser", package: "swift-argument-parser"),
149111
.product(name: "SwiftSyntax", package: "swift-syntax"),
150112
.product(name: "SwiftParser", package: "swift-syntax"),
@@ -158,7 +120,7 @@ let package = Package(
158120
.testTarget(
159121
name: "SwiftFormatPerformanceTests",
160122
dependencies: [
161-
"SwiftFormatWhitespaceLinter",
123+
"SwiftFormat",
162124
"_SwiftFormatTestSupport",
163125
.product(name: "SwiftSyntax", package: "swift-syntax"),
164126
.product(name: "SwiftParser", package: "swift-syntax"),
@@ -167,11 +129,8 @@ let package = Package(
167129
.testTarget(
168130
name: "SwiftFormatTests",
169131
dependencies: [
132+
"SwiftFormat",
170133
"SwiftFormatConfiguration",
171-
"SwiftFormatCore",
172-
"SwiftFormatPrettyPrint",
173-
"SwiftFormatRules",
174-
"SwiftFormatWhitespaceLinter",
175134
"_SwiftFormatTestSupport",
176135
.product(name: "Markdown", package: "swift-markdown"),
177136
.product(name: "SwiftOperators", package: "swift-syntax"),

Sources/SwiftFormat/API/SwiftFormatter.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
import Foundation
1414
import SwiftDiagnostics
1515
import SwiftFormatConfiguration
16-
import SwiftFormatCore
17-
import SwiftFormatPrettyPrint
18-
import SwiftFormatRules
1916
import SwiftOperators
2017
import SwiftSyntax
2118

Sources/SwiftFormat/API/SwiftLinter.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
import Foundation
1414
import SwiftDiagnostics
1515
import SwiftFormatConfiguration
16-
import SwiftFormatCore
17-
import SwiftFormatPrettyPrint
18-
import SwiftFormatRules
19-
import SwiftFormatWhitespaceLinter
2016
import SwiftOperators
2117
import SwiftSyntax
2218

Sources/SwiftFormatRules/AddModifierRewriter.swift renamed to Sources/SwiftFormat/Core/AddModifierRewriter.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
import SwiftFormatCore
1413
import SwiftSyntax
1514

1615
fileprivate final class AddModifierRewriter: SyntaxRewriter {
File renamed without changes.
File renamed without changes.
File renamed without changes.

Sources/SwiftFormat/Core/Exports.swift

Lines changed: 0 additions & 20 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)