Fix regex

intitni · intitni · commit 3c4dd15279ab · 2024-01-05T16:48:06.000+08:00
diff --git a/Core/Sources/PromptToCodeService/OpenAIPromptToCodeService.swift b/Core/Sources/PromptToCodeService/OpenAIPromptToCodeService.swift
@@ -222,7 +222,7 @@ extension OpenAIPromptToCodeService {
     {
         func extractCodeFromMarkdown(_ markdown: String) -> (code: String, endIndex: Int)? {
             let codeBlockRegex = try! NSRegularExpression(
-                pattern: #"```(?:\w+)?[\n]([\s\S]+?)[\n]```"#,
+                pattern: #"```(?:\w+)?\R([\s\S]+?)\R```"#,
                 options: .dotMatchesLineSeparators
             )
             let range = NSRange(markdown.startIndex..<markdown.endIndex, in: markdown)
@@ -232,7 +232,7 @@ extension OpenAIPromptToCodeService {
             }
 
             let incompleteCodeBlockRegex = try! NSRegularExpression(
-                pattern: #"```(?:\w+)?[\n]([\s\S]+?)$"#,
+                pattern: #"```(?:\w+)?\R([\s\S]+?)$"#,
                 options: .dotMatchesLineSeparators
             )
             let range2 = NSRange(markdown.startIndex..<markdown.endIndex, in: markdown)
diff --git a/Pro b/Pro
@@ -1 +1 @@
-Subproject commit cf463634d1b1bec46a9668666ce10474c9cbdb9a
+Subproject commit 46c52cbda929e8eb2172adc079ad29eb423b8737

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ extension OpenAIPromptToCodeService {`
`222`	`222`	`{`
`223`	`223`	`func extractCodeFromMarkdown(_ markdown: String) -> (code: String, endIndex: Int)? {`
`224`	`224`	`let codeBlockRegex = try! NSRegularExpression(`
`225`		- pattern: #"```(?:\w+)?[\n]([\s\S]+?)[\n]```"#,
	`225`	+ pattern: #"```(?:\w+)?\R([\s\S]+?)\R```"#,
`226`	`226`	`options: .dotMatchesLineSeparators`
`227`	`227`	`)`
`228`	`228`	`let range = NSRange(markdown.startIndex..<markdown.endIndex, in: markdown)`
`@@ -232,7 +232,7 @@ extension OpenAIPromptToCodeService {`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`let incompleteCodeBlockRegex = try! NSRegularExpression(`
`235`		- pattern: #"```(?:\w+)?[\n]([\s\S]+?)$"#,
	`235`	+ pattern: #"```(?:\w+)?\R([\s\S]+?)$"#,
`236`	`236`	`options: .dotMatchesLineSeparators`
`237`	`237`	`)`
`238`	`238`	`let range2 = NSRange(markdown.startIndex..<markdown.endIndex, in: markdown)`