Skip to content

Commit 1db1755

Browse files
committed
Make change backwards-compatible
1 parent 3cc84a6 commit 1db1755

File tree

2 files changed

+35
-2
lines changed

2 files changed

+35
-2
lines changed

Sources/Markdown/Walker/Walkers/MarkupFormatter.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public struct MarkupFormatter: MarkupWalker {
279279
thematicBreakCharacter: ThematicBreakCharacter = .dash,
280280
thematicBreakLength: UInt = 5,
281281
emphasisMarker: EmphasisMarker = .star,
282-
strongEmphasisMarker: EmphasisMarker = .star,
282+
strongEmphasisMarker: EmphasisMarker? = nil,
283283
condenseAutolinks: Bool = true,
284284
preferredHeadingStyle: PreferredHeadingStyle = .atx,
285285
preferredLineLimit: PreferredLineLimit? = nil,
@@ -291,7 +291,7 @@ public struct MarkupFormatter: MarkupWalker {
291291
self.defaultCodeBlockLanguage = defaultCodeBlockLanguage
292292
self.thematicBreakCharacter = thematicBreakCharacter
293293
self.emphasisMarker = emphasisMarker
294-
self.strongEmphasisMarker = strongEmphasisMarker
294+
self.strongEmphasisMarker = strongEmphasisMarker ?? emphasisMarker
295295
self.condenseAutolinks = condenseAutolinks
296296
self.preferredHeadingStyle = preferredHeadingStyle
297297
self.preferredLineLimit = preferredLineLimit

Tests/MarkdownTests/Visitors/MarkupFormatterTests.swift

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,23 @@ class MarkupFormatterOptionsTests: XCTestCase {
531531
let underline = "__strong__"
532532
let star = "**strong**"
533533

534+
do {
535+
let document = Document(parsing: underline)
536+
let printed = document.format(options: .init(emphasisMarker: .star))
537+
XCTAssertEqual(star, printed)
538+
}
539+
540+
do {
541+
let document = Document(parsing: star)
542+
let printed = document.format(options: .init(emphasisMarker: .underline))
543+
XCTAssertEqual(underline, printed)
544+
}
545+
}
546+
547+
do {
548+
let underline = "__strong__"
549+
let star = "**strong**"
550+
534551
do {
535552
let document = Document(parsing: underline)
536553
let printed = document.format(options: .init(strongEmphasisMarker: .star))
@@ -542,7 +559,23 @@ class MarkupFormatterOptionsTests: XCTestCase {
542559
let printed = document.format(options: .init(strongEmphasisMarker: .underline))
543560
XCTAssertEqual(underline, printed)
544561
}
562+
}
563+
564+
do {
565+
let underline = "__strong__"
566+
let star = "**strong**"
545567

568+
do {
569+
let document = Document(parsing: underline)
570+
let printed = document.format(options: .init(emphasisMarker: .underline, strongEmphasisMarker: .star))
571+
XCTAssertEqual(star, printed)
572+
}
573+
574+
do {
575+
let document = Document(parsing: star)
576+
let printed = document.format(options: .init(emphasisMarker: .star, strongEmphasisMarker: .underline))
577+
XCTAssertEqual(underline, printed)
578+
}
546579
}
547580
}
548581

0 commit comments

Comments
 (0)