Merge pull request #1165 from EnsembleUI/regex_fix_1164

#1164 fixing regex for o…

Author: kmahmood74

lib/util/utils.dart

@@ -621,12 +621,11 @@ class Utils {
     return int.tryParse(value);
   }
 
-  static final onlyExpression = RegExp(
-      r'''^\${([a-z_-\d\s.,:?!$@&|<>\+/*|%^="'\(\)\[\]]+)}$''',
-      caseSensitive: false);
-  static final containExpression = RegExp(
-      r'''\${([a-z_-\d\s.,:?!$@&|<>\+/*|%^="'\(\)\[\]]+)}''',
-      caseSensitive: false);
+  static final onlyExpression =
+      RegExp(r'''^\$\{([^}]+)\}$''', caseSensitive: false);
+
+  static final containExpression =
+      RegExp(r'''\$\{([^}{]+(?:\{[^}{]*\}[^}{]*)*)\}''', caseSensitive: false);
 
   static final i18nExpression = RegExp(r'\br@([\w\.]+)', caseSensitive: false);