From d5d305193ce527f1cc3022c406de35d9a85d4ccb Mon Sep 17 00:00:00 2001
From: hrxi <hrrrxi@gmail.com>
Date: Sun, 1 Sep 2019 18:18:25 +0200
Subject: Fix some warnings

Instances of `RegexError` are just asserted as `assert_not_reached` as
they cannot really fail except for allocation failure if the given regex
is valid.
---
 main/src/ui/util/helper.vala | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

(limited to 'main/src/ui/util/helper.vala')

diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala
index 449936fc..c3353fb6 100644
--- a/main/src/ui/util/helper.vala
+++ b/main/src/ui/util/helper.vala
@@ -188,15 +188,19 @@ public static string parse_add_markup(string s_, string? highlight_word, bool pa
     }
 
     if (highlight_word != null) {
-        Regex highlight_regex = new Regex("\\b" + Regex.escape_string(highlight_word.down()) + "\\b");
-        MatchInfo match_info;
-        highlight_regex.match(s.down(), 0, out match_info);
-        if (match_info.matches()) {
-            int start, end;
-            match_info.fetch_pos(0, out start, out end);
-            return parse_add_markup(s[0:start], highlight_word, parse_links, parse_text_markup, already_escaped) +
-                "<b>" + s[start:end] + "</b>" +
-                parse_add_markup(s[end:s.length], highlight_word, parse_links, parse_text_markup, already_escaped);
+        try {
+            Regex highlight_regex = new Regex("\\b" + Regex.escape_string(highlight_word.down()) + "\\b");
+            MatchInfo match_info;
+            highlight_regex.match(s.down(), 0, out match_info);
+            if (match_info.matches()) {
+                int start, end;
+                match_info.fetch_pos(0, out start, out end);
+                return parse_add_markup(s[0:start], highlight_word, parse_links, parse_text_markup, already_escaped) +
+                    "<b>" + s[start:end] + "</b>" +
+                    parse_add_markup(s[end:s.length], highlight_word, parse_links, parse_text_markup, already_escaped);
+            }
+        } catch (RegexError e) {
+            assert_not_reached();
         }
     }
 
@@ -206,15 +210,19 @@ public static string parse_add_markup(string s_, string? highlight_word, bool pa
 
         for (int i = 0; i < markup_string.length; i++) {
             string markup_esc = Regex.escape_string(markup_string[i]);
-            Regex regex = new Regex("(^|\\s)" + markup_esc + "(\\S.*?\\S|\\S)" + markup_esc + "($|\\s)");
-            MatchInfo match_info;
-            regex.match(s.down(), 0, out match_info);
-            if (match_info.matches()) {
-                int start, end;
-                match_info.fetch_pos(2, out start, out end);
-                return parse_add_markup(s[0:start], highlight_word, parse_links, parse_text_markup, already_escaped) +
-                    @"<$(convenience_tag[i])>" + s[start:end] + @"</$(convenience_tag[i])>" +
-                    parse_add_markup(s[end:s.length], highlight_word, parse_links, parse_text_markup, already_escaped);
+            try {
+                Regex regex = new Regex("(^|\\s)" + markup_esc + "(\\S.*?\\S|\\S)" + markup_esc + "($|\\s)");
+                MatchInfo match_info;
+                regex.match(s.down(), 0, out match_info);
+                if (match_info.matches()) {
+                    int start, end;
+                    match_info.fetch_pos(2, out start, out end);
+                    return parse_add_markup(s[0:start], highlight_word, parse_links, parse_text_markup, already_escaped) +
+                        @"<$(convenience_tag[i])>" + s[start:end] + @"</$(convenience_tag[i])>" +
+                        parse_add_markup(s[end:s.length], highlight_word, parse_links, parse_text_markup, already_escaped);
+                }
+            } catch (RegexError e) {
+                assert_not_reached();
             }
         }
     }
-- 
cgit v1.2.3-54-g00ecf