Backout 'smart' digit separation & Fix Mages functions for Calculator plugin

Plugins/Flow.Launcher.Plugin.Calculator/Languages/en.xaml

@@ -4,7 +4,7 @@
     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <system:String x:Key="flowlauncher_plugin_calculator_plugin_name">Calculator</system:String>
-    <system:String x:Key="flowlauncher_plugin_calculator_plugin_description">Perform mathematical calculations (including hexadecimal values). Use ',' or '.' as thousand separator or decimal place.</system:String>
+    <system:String x:Key="flowlauncher_plugin_calculator_plugin_description">Perform mathematical calculations, including hex values and advanced functions such as 'min(1,2,3)', 'sqrt(123)' and 'cos(123)'.</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_not_a_number">Not a number (NaN)</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_expression_not_complete">Expression wrong or incomplete (Did you forget some parentheses?)</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_copy_number_to_clipboard">Copy this number to the clipboard</system:String>
@@ -15,4 +15,5 @@
     <system:String x:Key="flowlauncher_plugin_calculator_decimal_separator_dot">Dot (.)</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_max_decimal_places">Max. decimal places</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_failed_to_copy">Copy failed, please try later</system:String>
+    <system:String x:Key="flowlauncher_plugin_calculator_show_error_message">Show error message when calculation fails</system:String>
 </ResourceDictionary>

Plugins/Flow.Launcher.Plugin.Calculator/MainRegexHelper.cs

@@ -4,16 +4,15 @@
 
 internal static partial class MainRegexHelper
 {
-
-    [GeneratedRegex(@"[\(\)\[\]]", RegexOptions.Compiled)]
-    public static partial Regex GetRegBrackets();
-
-    [GeneratedRegex(@"^(ceil|floor|exp|pi|e|max|min|det|abs|log|ln|sqrt|sin|cos|tan|arcsin|arccos|arctan|eigval|eigvec|eig|sum|polar|plot|round|sort|real|zeta|bin2dec|hex2dec|oct2dec|factorial|sign|isprime|isinfty|==|~=|&&|\|\||(?:\<|\>)=?|[ei]|[0-9]|0x[\da-fA-F]+|[\+\%\-\*\/\^\., ""]|[\(\)\|\!\[\]])+$", RegexOptions.Compiled)]
-    public static partial Regex GetRegValidExpressChar();
-
-    [GeneratedRegex(@"[\d\.,]+", RegexOptions.Compiled)]
+    [GeneratedRegex(@"-?[\d\.,'\u00A0\u202F]+", RegexOptions.Compiled | RegexOptions.CultureInvariant)]
     public static partial Regex GetNumberRegex();
 
     [GeneratedRegex(@"\B(?=(\d{3})+(?!\d))", RegexOptions.Compiled)]
     public static partial Regex GetThousandGroupRegex();
+
+    [GeneratedRegex(@"\bpow(\((?:[^()\[\]]|\((?<Depth>)|\)(?<-Depth>)|\[(?<Depth>)|\](?<-Depth>))*(?(Depth)(?!))\))", RegexOptions.Compiled | RegexOptions.RightToLeft | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
+    public static partial Regex GetPowRegex();
+
+    [GeneratedRegex(@"\b(sqrt|pow|factorial|abs|sign|ceil|floor|round|exp|log|log2|log10|min|max|lt|eq|gt|sin|cos|tan|arcsin|arccos|arctan|isnan|isint|isprime|isinfty|rand|randi|type|is|as|length|throw|catch|eval|map|clamp|lerp|regex|shuffle)\s*\(", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
+    public static partial Regex GetFunctionRegex();
 }

Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs

@@ -1,9 +1,11 @@
 
-namespace Flow.Launcher.Plugin.Calculator
+namespace Flow.Launcher.Plugin.Calculator;
+
+public class Settings
 {
-    public class Settings
-    {
-        public DecimalSeparator DecimalSeparator { get; set; } = DecimalSeparator.UseSystemLocale;
-        public int MaxDecimalPlaces { get; set; } = 10;      
-    }
+    public DecimalSeparator DecimalSeparator { get; set; } = DecimalSeparator.UseSystemLocale;
+
+    public int MaxDecimalPlaces { get; set; } = 10;
+
+    public bool ShowErrorMessage { get; set; } = false;
 }

Plugins/Flow.Launcher.Plugin.Calculator/ViewModels/SettingsViewModel.cs

@@ -1,31 +1,25 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Flow.Launcher.Plugin.Calculator.ViewModels
-{
-    public class SettingsViewModel : BaseModel
-    {
-        public SettingsViewModel(Settings settings)
-        {
-            Settings = settings;
-        }
+namespace Flow.Launcher.Plugin.Calculator.ViewModels;
 
-        public Settings Settings { get; init; }
+public class SettingsViewModel(Settings settings) : BaseModel
+{
+    public Settings Settings { get; init; } = settings;
 
-        public static IEnumerable<int> MaxDecimalPlacesRange => Enumerable.Range(1, 20);
+    public static IEnumerable<int> MaxDecimalPlacesRange => Enumerable.Range(1, 20);
 
-        public List<DecimalSeparatorLocalized> AllDecimalSeparator { get; } = DecimalSeparatorLocalized.GetValues();
+    public List<DecimalSeparatorLocalized> AllDecimalSeparator { get; } = DecimalSeparatorLocalized.GetValues();
 
-        public DecimalSeparator SelectedDecimalSeparator
+    public DecimalSeparator SelectedDecimalSeparator
+    {
+        get => Settings.DecimalSeparator;
+        set
         {
-            get => Settings.DecimalSeparator;
-            set
+            if (Settings.DecimalSeparator != value)
             {
-                if (Settings.DecimalSeparator != value)
-                {
-                    Settings.DecimalSeparator = value;
-                    OnPropertyChanged();
-                }
+                Settings.DecimalSeparator = value;
+                OnPropertyChanged();
             }
         }
     }

Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml

@@ -15,6 +15,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
@@ -58,5 +59,14 @@
             ItemsSource="{Binding MaxDecimalPlacesRange}"
             SelectedItem="{Binding Settings.MaxDecimalPlaces}" />
 
+        <CheckBox
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            Content="{DynamicResource flowlauncher_plugin_calculator_show_error_message}"
+            IsChecked="{Binding Settings.ShowErrorMessage, Mode=TwoWay}" />
     </Grid>
 </UserControl>

Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml.cs

@@ -1,22 +1,16 @@
 using System.Windows.Controls;
 using Flow.Launcher.Plugin.Calculator.ViewModels;
 
-namespace Flow.Launcher.Plugin.Calculator.Views
+namespace Flow.Launcher.Plugin.Calculator.Views;
+
+public partial class CalculatorSettings : UserControl
 {
-    /// <summary>
-    /// Interaction logic for CalculatorSettings.xaml
-    /// </summary>
-    public partial class CalculatorSettings : UserControl
-    {
-        private readonly SettingsViewModel _viewModel;
-        private readonly Settings _settings;
+    private readonly SettingsViewModel _viewModel;
 
-        public CalculatorSettings(Settings settings)
-        {
-            _viewModel = new SettingsViewModel(settings);
-            _settings = _viewModel.Settings;
-            DataContext = _viewModel;
-            InitializeComponent();
-        }
+    public CalculatorSettings(Settings settings)
+    {
+        _viewModel = new SettingsViewModel(settings);
+        DataContext = _viewModel;
+        InitializeComponent();
     }
 }

Plugins/Flow.Launcher.Plugin.Calculator/plugin.json

@@ -2,8 +2,8 @@
   "ID": "CEA0FDFC6D3B4085823D60DC76F28855",
   "ActionKeyword": "*",
   "Name": "Calculator",
-  "Description": "Perform mathematical calculations (including hexadecimal values). Use ',' or '.' as thousand separator or decimal place.",
+  "Description": "Perform mathematical calculations, including hex values and advanced functions such as 'min(1,2,3)', 'sqrt(123)' and 'cos(123)'.",
   "Author": "cxfksword, dcog989",
   "Version": "1.0.0",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",