Skip to content

Commit 0de82a9

Browse files
committed
Merge branch 'main' into parameter-diff
2 parents eabb166 + e6b6295 commit 0de82a9

File tree

5 files changed

+23
-25
lines changed

5 files changed

+23
-25
lines changed

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ let package = Package(
3131
)
3232
],
3333
dependencies: [
34-
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
34+
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.1"),
3535
.package(url: "https://github.com/swiftlang/swift-syntax", from: "601.0.1"),
36-
.package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.5"),
37-
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.4.3"),
36+
.package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.56.3"),
37+
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.4.4"),
3838
.package(url: "https://github.com/SimplyDanny/SwiftLintPlugins", from: "0.59.1")
3939
],
4040
targets: [

Sources/PublicModules/PADOutputGenerator/Documentation.docc/PADOutputGenerator.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ _Comparing `old` to `new`_
3333
---
3434
## SomeModule
3535
#### ❇️ Added
36-
```javascript
36+
```swift
3737
public protocol NewProtocol {
3838
var property: String { get }
3939
}
4040
```
4141
#### 🔀 Changed
42-
```javascript
42+
```swift
4343
// From
4444
open class SomeClass : SomeProtocol, OldProtocol
4545

@@ -53,6 +53,6 @@ Changes:
5353
*/
5454
```
5555
#### 😶‍🌫️ Removed
56-
```javascript
56+
```swift
5757
public protocol OldProtocol
5858
```

Sources/PublicModules/PADOutputGenerator/MarkdownOutputGenerator.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,7 @@ private extension MarkdownOutputGenerator {
164164

165165
var lines = [title]
166166
changes.sorted { lhs, rhs in description(for: lhs) < description(for: rhs) }.forEach {
167-
// We're using `javascript` as it produces the nicest looking markdown output on Github
168-
// `swift` is available but sometimes produces unexpected syntax highlighting
169-
lines.append("```javascript")
167+
lines.append("```swift")
170168
lines.append(description(for: $0))
171169

172170
if !$0.listOfChanges.isEmpty {

Tests/UnitTests/OutputGeneratorTests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class OutputGeneratorTests: XCTestCase {
4141
---
4242
## `Target_1`
4343
#### ❇️ Added
44-
```javascript
44+
```swift
4545
Some Addition
4646
```
4747
@@ -72,20 +72,20 @@ class OutputGeneratorTests: XCTestCase {
7272
---
7373
## `Target_1`
7474
#### ❇️ Added
75-
```javascript
75+
```swift
7676
Some Addition
7777
```
7878
#### ❌ Removed
79-
```javascript
79+
```swift
8080
Some Removal
8181
```
8282
## `Target_2`
8383
#### ❇️ Added
84-
```javascript
84+
```swift
8585
Another Addition
8686
```
8787
#### ❌ Removed
88-
```javascript
88+
```swift
8989
Another Removal
9090
```
9191

Tests/UnitTests/Resources/expected-reference-changes.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _Comparing `/.../.../UpdatedPackage` to `/.../.../ReferencePackage`_
44
---
55
## `ReferencePackage`
66
#### 🔀 Changed
7-
```javascript
7+
```swift
88
// From
99
public protocol CustomProtocol
1010

@@ -16,7 +16,7 @@ Changes:
1616
- Added generic signature `<Self.CustomAssociatedType : Equatable>`
1717
*/
1818
```
19-
```javascript
19+
```swift
2020
// From
2121
public struct CustomStruct : CustomProtocol
2222

@@ -30,42 +30,42 @@ Changes:
3030
```
3131
### `CustomProtocol`
3232
#### ❇️ Added
33-
```javascript
33+
```swift
3434
public associatedtype CustomAssociatedType
3535
```
3636
#### 🔀 Changed
37-
```javascript
37+
```swift
3838
// From
3939
public func function<Self where Self : ReferencePackage.CustomProtocol>() -> any Self.CustomAssociatedType
4040

4141
// To
4242
public func function<Self where Self : ReferencePackage.CustomProtocol>() -> Self.CustomAssociatedType
4343
```
44-
```javascript
44+
```swift
4545
// From
4646
public var getSetVar: any Self.CustomAssociatedType { get set }
4747

4848
// To
4949
public var getSetVar: Self.CustomAssociatedType { get set }
5050
```
51-
```javascript
51+
```swift
5252
// From
5353
public var getVar: any Self.CustomAssociatedType { get }
5454

5555
// To
5656
public var getVar: Self.CustomAssociatedType { get }
5757
```
5858
#### 😶‍🌫️ Removed
59-
```javascript
59+
```swift
6060
public typealias CustomAssociatedType = Equatable
6161
```
6262
### `CustomStruct`
6363
#### ❇️ Added
64-
```javascript
64+
```swift
6565
public typealias CustomAssociatedType = Int
6666
```
6767
#### 🔀 Changed
68-
```javascript
68+
```swift
6969
// From
7070
@discardableResult public func function() -> any Equatable
7171

@@ -77,14 +77,14 @@ Changes:
7777
- Added generic signature `<T where T : Strideable>`
7878
*/
7979
```
80-
```javascript
80+
```swift
8181
// From
8282
public var getSetVar: any Equatable { get set }
8383

8484
// To
8585
public var getSetVar: Int { get set }
8686
```
87-
```javascript
87+
```swift
8888
// From
8989
public var getVar: any Equatable { get set }
9090

0 commit comments

Comments
 (0)