Merge pull request #68 from leoananth/master

malcommac · web-flow · commit 7b6b3a58c120 · 2019-03-28T10:12:17.000+01:00
Fixes for regular expression to parse generic tags
diff --git a/Sources/SwiftRichString/Style/StyleGroup.swift b/Sources/SwiftRichString/Style/StyleGroup.swift
@@ -86,7 +86,7 @@ public class StyleGroup: StyleProtocol {
 		private func extractParametersFromTags(_ string: String) -> [String: String]? {
 			guard let _ = string.firstIndex(of: " ") else { return nil } // no tags
 
-			let pattern = "\\w*\\s*=\\s*\"?\\s*([\\w\\s%#\\/\\.;:_-]*)\\s*\"?.*?" // maybe shorter?
+			let pattern = "\\w*\\s*=\\s*\"?\\s*([^\"][^\"]*)\\s*\"?.*?" // maybe shorter?
 			guard let regex = try? NSRegularExpression(pattern: pattern, options: .dotMatchesLineSeparators) else {
 				return nil
 			}

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public class StyleGroup: StyleProtocol {`
`86`	`86`	`private func extractParametersFromTags(_ string: String) -> [String: String]? {`
`87`	`87`	`guard let _ = string.firstIndex(of: " ") else { return nil } // no tags`
`88`	`88`
`89`		`- let pattern = "\\w\\s=\\s\"?\\s([\\w\\s%#\\/\\.;:_-])\\s\"?.*?" // maybe shorter?`
	`89`	`+ let pattern = "\\w\\s=\\s\"?\\s([^\"][^\"])\\s\"?.*?" // maybe shorter?`
`90`	`90`	`guard let regex = try? NSRegularExpression(pattern: pattern, options: .dotMatchesLineSeparators) else {`
`91`	`91`	`return nil`
`92`	`92`	`}`