Skip to content

Commit 4b877c7

Browse files
committed
some fixes
1 parent 85d8fbc commit 4b877c7

File tree

6 files changed

+21
-6
lines changed

6 files changed

+21
-6
lines changed

Package.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ let package = Package(
1515
),
1616
.library(
1717
name: "SwiftInterfaceDiff",
18-
targets: ["SwiftInterfaceAnalyzerModule"]
18+
targets: [
19+
"SwiftInterfaceAnalyzerModule",
20+
"OutputGeneratorModule"
21+
]
1922
)
2023
],
2124
dependencies: [
@@ -67,6 +70,8 @@ let package = Package(
6770
name: "SwiftInterfaceAnalyzerModule",
6871
dependencies: [
6972
"CoreModule",
73+
"FileHandlingModule",
74+
"LoggingModule",
7075
.product(name: "SwiftSyntax", package: "swift-syntax"),
7176
.product(name: "SwiftParser", package: "swift-syntax"),
7277
],

Sources/PipelineModules/ProjectBuilderModule/SwiftPackageFileAnalyzer/SwiftPackageFileAnalyzer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public struct SwiftPackageFileAnalyzer: SwiftPackageFileAnalyzing {
2020
private enum Constants {
2121
static let packageFileName = "Package.swift"
2222
static func packageFileName(child: String) -> String {
23-
"\(packageFileName) / \(child)"
23+
".\(child)"
2424
}
2525
}
2626

Sources/PipelineModules/SwiftInterfaceAnalyzerModule/SwiftInterfaceParser/DeclSyntax+Convenience.swift

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ extension AccessorBlockSyntax {
2222
///
2323
/// e.g. "get\n set\n" -> "get set"
2424
var sanitizedDescription: String {
25-
accessors.trimmedDescription.replacingOccurrences(of: "[\n ]+", with: " ", options: .regularExpression)
25+
accessors.trimmedDescription.sanitizingNewlinesAndSpaces
26+
}
27+
}
28+
29+
extension String {
30+
31+
/// Produces a string where all newlines and spaces are replaced by a single space
32+
///
33+
/// e.g. "get\n set\n" -> "get set"
34+
var sanitizingNewlinesAndSpaces: String {
35+
self.replacingOccurrences(of: "[\n ]+", with: " ", options: .regularExpression)
2636
}
2737
}

Sources/PipelineModules/SwiftInterfaceAnalyzerModule/SwiftInterfaceParser/DeclSyntax+SwiftInterface/FunctionDeclSyntax+SwiftInterface.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extension FunctionDeclSyntax {
2222
firstName: $0.firstName.trimmedDescription,
2323
secondName: $0.secondName?.trimmedDescription,
2424
type: $0.type.trimmedDescription,
25-
defaultValue: $0.defaultValue?.value.description
25+
defaultValue: $0.defaultValue?.value.trimmedDescription.sanitizingNewlinesAndSpaces
2626
)
2727
}
2828

Sources/PipelineModules/SwiftInterfaceAnalyzerModule/SwiftInterfaceParser/DeclSyntax+SwiftInterface/InitializerDeclSyntax+SwiftInterface.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extension InitializerDeclSyntax {
2222
firstName: $0.firstName.trimmedDescription,
2323
secondName: $0.secondName?.trimmedDescription,
2424
type: $0.type.trimmedDescription,
25-
defaultValue: $0.defaultValue?.value.description
25+
defaultValue: $0.defaultValue?.value.trimmedDescription.sanitizingNewlinesAndSpaces
2626
)
2727
}
2828

Sources/PipelineModules/SwiftInterfaceAnalyzerModule/SwiftInterfaceParser/DeclSyntax+SwiftInterface/SubscriptDeclSyntax+SwiftInterface.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ extension SubscriptDeclSyntax {
1111
firstName: $0.firstName.trimmedDescription,
1212
secondName: $0.secondName?.trimmedDescription,
1313
type: $0.type.trimmedDescription,
14-
defaultValue: $0.defaultValue?.value.description
14+
defaultValue: $0.defaultValue?.value.trimmedDescription.sanitizingNewlinesAndSpaces
1515
)
1616
}
1717

0 commit comments

Comments
 (0)