Converter: Fix warning shown when converting (take 2) (#15)

Prevent the following error is shown when converting case: ** (example:22849): WARNING **: 21:34:14.068: Converter.vala:280: Error while matching regular expression ^([A-Z]): UTF-8 error: byte 2 top bits not 0x80
ryonakano · Apr 23, 2024 · 8f405aa · 8f405aa
1 parent 0dd595e
commit 8f405aa
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/lib/Converter.vala b/lib/Converter.vala
@@ -243,7 +243,8 @@ namespace ChCase {
          * @param text Text to be converted
          * @return Result text after conversion
          */
-        public string convert_case (owned string text) {
+        public string convert_case (string text) {
+            string result = text;
             PatternType.Pattern regex_pattern;
             switch (source_case) {
                 case Case.SPACE_SEPARATED:
@@ -268,19 +269,16 @@ namespace ChCase {
                     assert_not_reached ();
             }
 
-            MatchInfo match_info;
             try {
                 for (int i = 0; i < regex_pattern.detect_patterns.length; i++) {
                     var regex = new Regex (regex_pattern.detect_patterns.index (i));
-                    for (regex.match (text, 0, out match_info); match_info.matches (); match_info.next ()) {
-                        text = regex.replace (text, text.length, 0, regex_pattern.replace_patterns.index (i));
-                    }
+                    result = regex.replace (result, result.length, 0, regex_pattern.replace_patterns.index (i));
                 }
             } catch (RegexError e) {
                 warning (e.message);
             }
 
-            return text;
+            return result;
         }
     }
 }