Skip to content

Commit eb8e694

Browse files
authored
fix for replacing the term abstract with summary in diagnostic (#310)
fix for replacing the term abstract with summary in diagnostic rdar://78015631
1 parent 42c7ba9 commit eb8e694

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

Sources/SwiftDocC/Checker/Checkers/AbstractContainsFormattedTextOnly.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public struct AbstractContainsFormattedTextOnly: Checker {
3030

3131
var diagnosticIdentifier: String {
3232
switch self {
33-
case .image: return "org.swift.docc.AbstractContainsImage"
34-
case .link: return "org.swift.docc.AbstractContainsLink"
33+
case .image: return "org.swift.docc.SummaryContainsImage"
34+
case .link: return "org.swift.docc.SummaryContainsLink"
3535
}
3636
}
3737

@@ -45,9 +45,9 @@ public struct AbstractContainsFormattedTextOnly: Checker {
4545

4646
private mutating func foundInvalidContent(_ invalidContent: InvalidContent, markup: Markup) {
4747
let explanation = """
48-
Abstracts should only contain (formatted) text. To resolve this issue, place links and images elsewhere in the document, or remove them.
48+
Summary should only contain (formatted) text. To resolve this issue, place links and images elsewhere in the document, or remove them.
4949
"""
50-
let diagnostic = Diagnostic(source: sourceFile, severity: .warning, range: markup.range, identifier: invalidContent.diagnosticIdentifier, summary: "\(invalidContent.description.capitalized) in document abstract will not be displayed", explanation: explanation)
50+
let diagnostic = Diagnostic(source: sourceFile, severity: .warning, range: markup.range, identifier: invalidContent.diagnosticIdentifier, summary: "\(invalidContent.description.capitalized) in document summary will not be displayed", explanation: explanation)
5151
let problem = Problem(diagnostic: diagnostic, possibleSolutions: [])
5252
problems.append(problem)
5353
}

Sources/SwiftDocC/Checker/Checkers/MissingAbstract.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public struct MissingAbstract: Checker {
5656
severity: .information,
5757
range: titleRange,
5858
identifier: "org.swift.docc.DocumentHasNoAbstract",
59-
summary: "This document does not have an abstract.",
59+
summary: "This document does not have a summary.",
6060
explanation: explanation)
6161

6262
problems.append(Problem(diagnostic: diagnostic, possibleSolutions: []))

Sources/SwiftDocC/Infrastructure/Diagnostics/Diagnostic.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public struct Diagnostic: DescribedError {
3232
///
3333
/// ## Example
3434
///
35-
/// `org.swift.docc.AbstractContainsLink`
35+
/// `org.swift.docc.SummaryContainsLink`
3636
public var identifier: String
3737

3838
/// Provides the short, localized abstract provided by ``localizedExplanation`` in plain text if an

Tests/SwiftDocCTests/Checker/Checkers/AbstractContainsFormattedTextOnlyTests.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ This paragraph isn't [analyzed](http://example.com/image.jpg).
5151
XCTAssertTrue(problem.possibleSolutions.isEmpty)
5252

5353
let image = document.child(at: 1)!.child(at: 0)! as! Image
54-
verifyDiagnostic(diagnostic: problem.diagnostic, expectedIdentifier: "org.swift.docc.AbstractContainsImage", expectedRange: image.range!)
54+
verifyDiagnostic(diagnostic: problem.diagnostic, expectedIdentifier: "org.swift.docc.SummaryContainsImage", expectedRange: image.range!)
5555
}
5656

5757
func testTopLevelLink() {
@@ -71,7 +71,7 @@ More info [here](http://example.com/image.jpg).
7171
XCTAssertTrue(problem.possibleSolutions.isEmpty)
7272

7373
let link = document.child(at: 1)!.child(at: 1)! as! Link
74-
verifyDiagnostic(diagnostic: problem.diagnostic, expectedIdentifier: "org.swift.docc.AbstractContainsLink", expectedRange: link.range!)
74+
verifyDiagnostic(diagnostic: problem.diagnostic, expectedIdentifier: "org.swift.docc.SummaryContainsLink", expectedRange: link.range!)
7575
}
7676

7777
func testMultipleTopLevelInvalidElements() {
@@ -94,9 +94,9 @@ More info [here](http://example.com/image.jpg).
9494
let image2 = abstract.child(at: 2)! as! Link
9595
let image3 = abstract.child(at: 4)! as! Image
9696

97-
verifyDiagnostic(diagnostic: checker.problems[0].diagnostic, expectedIdentifier: "org.swift.docc.AbstractContainsImage", expectedRange: image1.range!)
98-
verifyDiagnostic(diagnostic: checker.problems[1].diagnostic, expectedIdentifier: "org.swift.docc.AbstractContainsLink", expectedRange: image2.range!)
99-
verifyDiagnostic(diagnostic: checker.problems[2].diagnostic, expectedIdentifier: "org.swift.docc.AbstractContainsImage", expectedRange: image3.range!)
97+
verifyDiagnostic(diagnostic: checker.problems[0].diagnostic, expectedIdentifier: "org.swift.docc.SummaryContainsImage", expectedRange: image1.range!)
98+
verifyDiagnostic(diagnostic: checker.problems[1].diagnostic, expectedIdentifier: "org.swift.docc.SummaryContainsLink", expectedRange: image2.range!)
99+
verifyDiagnostic(diagnostic: checker.problems[2].diagnostic, expectedIdentifier: "org.swift.docc.SummaryContainsImage", expectedRange: image3.range!)
100100
}
101101

102102
func testLinkWithinEmphasis() {
@@ -114,7 +114,7 @@ Hello *[world](http://example.com)*.
114114
}
115115

116116
let link = document.child(at: 1)!.child(at: 1)!.child(at: 0)! as! Link
117-
verifyDiagnostic(diagnostic: checker.problems[0].diagnostic, expectedIdentifier: "org.swift.docc.AbstractContainsLink", expectedRange: link.range!)
117+
verifyDiagnostic(diagnostic: checker.problems[0].diagnostic, expectedIdentifier: "org.swift.docc.SummaryContainsLink", expectedRange: link.range!)
118118
}
119119

120120
func testImagesWithinBold() {
@@ -131,7 +131,7 @@ Hello **![image](http://example.com/image1.jpg)** World
131131
}
132132

133133
let image = document.child(at: 1)!.child(at: 1)!.child(at: 0)! as! Image
134-
verifyDiagnostic(diagnostic: checker.problems[0].diagnostic, expectedIdentifier: "org.swift.docc.AbstractContainsImage", expectedRange: image.range!)
134+
verifyDiagnostic(diagnostic: checker.problems[0].diagnostic, expectedIdentifier: "org.swift.docc.SummaryContainsImage", expectedRange: image.range!)
135135
}
136136

137137
func testImageInALink() {
@@ -149,7 +149,7 @@ Hello **[![image](http://example.com/image1.jpg)](http://example.com)** World.
149149
let link = document.child(at: 1)!.child(at: 1)!.child(at: 0)! as! Link
150150
let image = document.child(at: 1)!.child(at: 1)!.child(at: 0)!.child(at: 0)! as! Image
151151

152-
verifyDiagnostic(diagnostic: checker.problems[0].diagnostic, expectedIdentifier: "org.swift.docc.AbstractContainsLink", expectedRange: link.range!)
153-
verifyDiagnostic(diagnostic: checker.problems[1].diagnostic, expectedIdentifier: "org.swift.docc.AbstractContainsImage", expectedRange: image.range!)
152+
verifyDiagnostic(diagnostic: checker.problems[0].diagnostic, expectedIdentifier: "org.swift.docc.SummaryContainsLink", expectedRange: link.range!)
153+
verifyDiagnostic(diagnostic: checker.problems[1].diagnostic, expectedIdentifier: "org.swift.docc.SummaryContainsImage", expectedRange: image.range!)
154154
}
155155
}

0 commit comments

Comments
 (0)