Skip to content

Commit de0db3e

Browse files
committed
Make change backwards-compatible
1 parent c36c140 commit de0db3e

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
@@ -269,7 +269,7 @@ public struct MarkupFormatter: MarkupWalker {
269269
thematicBreakCharacter: ThematicBreakCharacter = .dash,
270270
thematicBreakLength: UInt = 5,
271271
emphasisMarker: EmphasisMarker = .star,
272-
strongEmphasisMarker: EmphasisMarker = .star,
272+
strongEmphasisMarker: EmphasisMarker? = nil,
273273
condenseAutolinks: Bool = true,
274274
preferredHeadingStyle: PreferredHeadingStyle = .atx,
275275
preferredLineLimit: PreferredLineLimit? = nil,
@@ -280,7 +280,7 @@ public struct MarkupFormatter: MarkupWalker {
280280
self.defaultCodeBlockLanguage = defaultCodeBlockLanguage
281281
self.thematicBreakCharacter = thematicBreakCharacter
282282
self.emphasisMarker = emphasisMarker
283-
self.strongEmphasisMarker = strongEmphasisMarker
283+
self.strongEmphasisMarker = strongEmphasisMarker ?? emphasisMarker
284284
self.condenseAutolinks = condenseAutolinks
285285
self.preferredHeadingStyle = preferredHeadingStyle
286286
self.preferredLineLimit = preferredLineLimit

Tests/MarkdownTests/Visitors/MarkupFormatterTests.swift

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,23 @@ class MarkupFormatterOptionsTests: XCTestCase {
431431
let underline = "__strong__"
432432
let star = "**strong**"
433433

434+
do {
435+
let document = Document(parsing: underline)
436+
let printed = document.format(options: .init(emphasisMarker: .star))
437+
XCTAssertEqual(star, printed)
438+
}
439+
440+
do {
441+
let document = Document(parsing: star)
442+
let printed = document.format(options: .init(emphasisMarker: .underline))
443+
XCTAssertEqual(underline, printed)
444+
}
445+
}
446+
447+
do {
448+
let underline = "__strong__"
449+
let star = "**strong**"
450+
434451
do {
435452
let document = Document(parsing: underline)
436453
let printed = document.format(options: .init(strongEmphasisMarker: .star))
@@ -442,7 +459,23 @@ class MarkupFormatterOptionsTests: XCTestCase {
442459
let printed = document.format(options: .init(strongEmphasisMarker: .underline))
443460
XCTAssertEqual(underline, printed)
444461
}
462+
}
463+
464+
do {
465+
let underline = "__strong__"
466+
let star = "**strong**"
445467

468+
do {
469+
let document = Document(parsing: underline)
470+
let printed = document.format(options: .init(emphasisMarker: .underline, strongEmphasisMarker: .star))
471+
XCTAssertEqual(star, printed)
472+
}
473+
474+
do {
475+
let document = Document(parsing: star)
476+
let printed = document.format(options: .init(emphasisMarker: .star, strongEmphasisMarker: .underline))
477+
XCTAssertEqual(underline, printed)
478+
}
446479
}
447480
}
448481

0 commit comments

Comments
 (0)