Make change backwards-compatible

swiftlang · Feb 2, 2023 · de0db3e · de0db3e
1 parent c36c140
commit de0db3e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/Sources/Markdown/Walker/Walkers/MarkupFormatter.swift b/Sources/Markdown/Walker/Walkers/MarkupFormatter.swift
@@ -269,7 +269,7 @@ public struct MarkupFormatter: MarkupWalker {
                     thematicBreakCharacter: ThematicBreakCharacter = .dash,
                     thematicBreakLength: UInt = 5,
                     emphasisMarker: EmphasisMarker = .star,
-                    strongEmphasisMarker: EmphasisMarker = .star,
+                    strongEmphasisMarker: EmphasisMarker? = nil,
                     condenseAutolinks: Bool = true,
                     preferredHeadingStyle: PreferredHeadingStyle = .atx,
                     preferredLineLimit: PreferredLineLimit? = nil,
@@ -280,7 +280,7 @@ public struct MarkupFormatter: MarkupWalker {
             self.defaultCodeBlockLanguage = defaultCodeBlockLanguage
             self.thematicBreakCharacter = thematicBreakCharacter
             self.emphasisMarker = emphasisMarker
-            self.strongEmphasisMarker = strongEmphasisMarker
+            self.strongEmphasisMarker = strongEmphasisMarker ?? emphasisMarker
             self.condenseAutolinks = condenseAutolinks
             self.preferredHeadingStyle = preferredHeadingStyle
             self.preferredLineLimit = preferredLineLimit

diff --git a/Tests/MarkdownTests/Visitors/MarkupFormatterTests.swift b/Tests/MarkdownTests/Visitors/MarkupFormatterTests.swift
@@ -431,6 +431,23 @@ class MarkupFormatterOptionsTests: XCTestCase {
             let underline = "__strong__"
             let star = "**strong**"
 
+            do {
+                let document = Document(parsing: underline)
+                let printed = document.format(options: .init(emphasisMarker: .star))
+                XCTAssertEqual(star, printed)
+            }
+
+            do {
+                let document = Document(parsing: star)
+                let printed = document.format(options: .init(emphasisMarker: .underline))
+                XCTAssertEqual(underline, printed)
+            }
+        }
+
+        do {
+            let underline = "__strong__"
+            let star = "**strong**"
+
             do {
                 let document = Document(parsing: underline)
                 let printed = document.format(options: .init(strongEmphasisMarker: .star))
@@ -442,7 +459,23 @@ class MarkupFormatterOptionsTests: XCTestCase {
                 let printed = document.format(options: .init(strongEmphasisMarker: .underline))
                 XCTAssertEqual(underline, printed)
             }
+        }
+
+        do {
+            let underline = "__strong__"
+            let star = "**strong**"
 
+            do {
+                let document = Document(parsing: underline)
+                let printed = document.format(options: .init(emphasisMarker: .underline, strongEmphasisMarker: .star))
+                XCTAssertEqual(star, printed)
+            }
+
+            do {
+                let document = Document(parsing: star)
+                let printed = document.format(options: .init(emphasisMarker: .star, strongEmphasisMarker: .underline))
+                XCTAssertEqual(underline, printed)
+            }
         }
     }