Fix #34 + many cosmetic improvements

AdguardTeam · Mar 1, 2022 · 6d7f6e5 · 6d7f6e5
1 parent 8e2d272
commit 6d7f6e5
Show file tree

Hide file tree

Showing 12 changed files with 1,085 additions and 1,005 deletions.
diff --git a/Sources/ContentBlockerConverter/Compiler/BlockerEntryFactory.swift b/Sources/ContentBlockerConverter/Compiler/BlockerEntryFactory.swift
@@ -197,8 +197,8 @@ class BlockerEntryFactory {
         }
 
         // Safari doesn't support non-ASCII characters in regular expressions
-        if (!(urlRegExpSource! as String).isASCII()) {
-            throw ConversionError.unsupportedRegExp(message: "Safari doesn't support non-ASCII characters in regular expressions");
+        if !urlRegExpSource!.canBeConverted(to: String.Encoding.ascii.rawValue) {
+            throw ConversionError.unsupportedRegExp(message: "Safari doesn't support non-ASCII characters in regular expressions")
         }
 
         // Regex that we generate for basic non-regex rules are okay

diff --git a/Sources/ContentBlockerConverter/Compiler/Compiler.swift b/Sources/ContentBlockerConverter/Compiler/Compiler.swift