Skip to content

perf(escaping): Remove catastrophic backtracking regex for code escape #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ivansss merged 1 commit into from
Feb 25, 2025
Merged

perf(escaping): Remove catastrophic backtracking regex for code escape #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions CDMarkdownKitTests/TestCode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@ final class TestCode: XCTestCase {
XCTAssertTrue(TestHelpers.isMonospaced(testString: parsed, at: 0))
}


func testCodeMultiple() throws {
let parser = getParser()

let parsed = parser.parse("`test` abc `test` abc")
XCTAssertEqual(parsed.string, "test abc test abc")
XCTAssertTrue(TestHelpers.isMonospaced(testString: parsed, at: 2))
XCTAssertFalse(TestHelpers.isMonospaced(testString: parsed, at: 6))
XCTAssertTrue(TestHelpers.isMonospaced(testString: parsed, at: 11))
XCTAssertFalse(TestHelpers.isMonospaced(testString: parsed, at: 15))
}

func testCodeSentence() throws {
let parser = getParser()

Expand Down
8 changes: 8 additions & 0 deletions CDMarkdownKitTests/TestSyntax.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,12 @@ final class TestSyntax: XCTestCase {
XCTAssertFalse(TestHelpers.anyBold(testString: parsed))
XCTAssertFalse(TestHelpers.anyItalic(testString: parsed))
}

func testSyntaxOnlyStart() throws {
let parser = getParser()

let parsed = parser.parse("```\nsyntax\n")
XCTAssertEqual(parsed.string, "```\nsyntax\n")
XCTAssertFalse(TestHelpers.isMonospaced(testString: parsed, at: 4))
}
}
4 changes: 2 additions & 2 deletions Source/CDMarkdownCodeEscaping.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@

open class CDMarkdownCodeEscaping: CDMarkdownElement {

fileprivate static let regex = ["(?<!\\\\)(?:\\\\\\\\)*+(`+)(.*?[^`].*?)(\\1)(?!`)"]
fileprivate static let regex = ["(?<!\\\\)(?:\\\\\\\\)*+(`+(?!`))([\\s\\S]*?)(\\1)"]
open var enabled: Bool = true

lazy open var regularExpressions: [NSRegularExpression] = {
// swiftlint:disable:next force_try
return try! CDMarkdownCodeEscaping.regex.map { try NSRegularExpression(pattern: $0, options: [.dotMatchesLineSeparators]) }
return try! CDMarkdownCodeEscaping.regex.map { try NSRegularExpression(pattern: $0, options: []) }
}()

open func match(_ match: NSTextCheckingResult,
Expand Down
Loading