feat: add decodeFull logic for splitted strings

dart-lang · Mar 18, 2024 · 94fed77 · 94fed77
1 parent bdf01c0
commit 94fed77
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/lib/src/util.dart b/lib/src/util.dart
@@ -53,15 +53,19 @@ String normalizeLinkDestination(String destination) {
 
   final regex = RegExp('%[0-9A-Fa-f]{2}');
   final matches = regex.allMatches(destination).toList();
-  final substrings = destination
-      .split(regex)
-      .map((e) => Uri.encodeFull(decodeHtmlCharacters(e)))
-      .toList();
-
-  final buffer = StringBuffer(substrings[0]);
+  final splitIterator = destination.split(regex).map((e) {
+    try {
+      e = Uri.decodeFull(e);
+    } catch (_) {}
+    return Uri.encodeFull(decodeHtmlCharacters(e));
+  }).iterator;
+
+  splitIterator.moveNext();
+  final buffer = StringBuffer(splitIterator.current);
   for (var i = 0; i < matches.length; i++) {
+    splitIterator.moveNext();
     buffer.write(matches[i].match);
-    buffer.write(substrings[i + 1]);
+    buffer.write(splitIterator.current);
   }
 
   return buffer.toString();