Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion Sources/SwiftParser/Languages/MarkdownLanguage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,31 @@ public struct MarkdownLanguage: CodeLanguage {
else { text += tok.text; context.index += 1 }
} else { context.index += 1 }
}
context.currentNode.addChild(CodeNode(type: Element.entity, value: text))
let decoded = decode(text)
context.currentNode.addChild(CodeNode(type: Element.entity, value: decoded))
}

private func decode(_ entity: String) -> String {
switch entity {
case "amp": return "&"
case "lt": return "<"
case "gt": return ">"
case "quot": return "\""
case "apos": return "'"
default:
if entity.hasPrefix("#x") || entity.hasPrefix("#X") {
let hex = entity.dropFirst(2)
if let value = UInt32(hex, radix: 16), let scalar = UnicodeScalar(value) {
return String(Character(scalar))
}
} else if entity.hasPrefix("#") {
let num = entity.dropFirst()
if let value = UInt32(num), let scalar = UnicodeScalar(value) {
return String(Character(scalar))
}
}
return "&" + entity + ";"
}
}
}

Expand Down
11 changes: 11 additions & 0 deletions Tests/SwiftParserTests/SwiftParserTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,17 @@ final class SwiftParserTests: XCTestCase {
XCTAssertEqual(result.root.children.first?.value, "*not italic*")
}

func testMarkdownEntityDecoding() {
let parser = SwiftParser()
let source = "&amp;&#35;&#x41;"
let result = parser.parse(source, language: MarkdownLanguage())
XCTAssertEqual(result.errors.count, 0)
XCTAssertEqual(result.root.children.count, 3)
XCTAssertEqual(result.root.children[0].value, "&")
XCTAssertEqual(result.root.children[1].value, "#")
XCTAssertEqual(result.root.children[2].value, "A")
}

func testPrattExpression() {
let parser = SwiftParser()
let source = "x = 1 + 2 * 3"
Expand Down