More code cleanup & improvements

Author: TBM13

Flow.Launcher.Core/Plugin/QueryBuilder.cs

@@ -31,21 +31,18 @@ public static class QueryBuilder
 
             string actionKeyword, search;
             string possibleActionKeyword = terms[0];
-            string[] searchTerms;
 
             if (nonGlobalPlugins.TryGetValue(possibleActionKeyword, out var pluginPair) && !pluginPair.Metadata.Disabled)
             {
                 // use non global plugin for query
                 actionKeyword = possibleActionKeyword;
                 search = terms.Length > 1 ? trimmedQuery[(actionKeyword.Length + 1)..].TrimStart() : string.Empty;
-                searchTerms = terms[1..];
             }
             else
             {
                 // non action keyword
                 actionKeyword = string.Empty;
                 search = trimmedQuery.TrimStart();
-                searchTerms = terms;
             }
 
             return new Query()

Flow.Launcher/Converters/BoolToVisibilityConverter.cs

@@ -1,12 +1,13 @@
-using System.Globalization;
+using System;
+using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
 namespace Flow.Launcher.Converters;
 
 public class BoolToVisibilityConverter : IValueConverter
 {
-    public object Convert(object value, System.Type targetType, object parameter, CultureInfo culture)
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
         return (value, parameter) switch
         {
@@ -18,13 +19,14 @@ public object Convert(object value, System.Type targetType, object parameter, Cu
         };
     }
 
-    public object ConvertBack(object value, System.Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException();
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        => throw new InvalidOperationException();
 }
 
 public class SplitterConverter : IValueConverter
 /* Prevents the dragging part of the preview area from working when preview is turned off. */
 {
-    public object Convert(object value, System.Type targetType, object parameter, CultureInfo culture)
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
         return (value, parameter) switch
         {
@@ -36,5 +38,5 @@ public object Convert(object value, System.Type targetType, object parameter, Cu
         };
     }
 
-    public object ConvertBack(object value, System.Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException();
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new InvalidOperationException();
 }

Flow.Launcher/Converters/BorderClipConverter.cs

@@ -19,7 +19,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
         }
 
         Path myPath = new Path();
-        if (width < Double.Epsilon || height < Double.Epsilon)
+        if (width < double.Epsilon || height < double.Epsilon)
         {
             return Geometry.Empty;
         }

Flow.Launcher/Converters/StringToKeyBindingConverter.cs

@@ -7,13 +7,13 @@ namespace Flow.Launcher.Converters;
 
 public class StringToKeyBindingConverter : IValueConverter
 {
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
         if (parameter is not string mode || value is not string hotkeyStr)
             return null;
 
         var converter = new KeyGestureConverter();
-        var key = (KeyGesture)converter.ConvertFromString(hotkeyStr);
+        var key = (KeyGesture?)converter.ConvertFromString(hotkeyStr);
         return mode switch
         {
             "key" => key?.Key,

Flow.Launcher/Flow.Launcher.csproj

@@ -12,6 +12,7 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Flow.Launcher/Helper/HotKeyMapper.cs

@@ -1,31 +1,33 @@
-using Flow.Launcher.Infrastructure.Hotkey;
+using System;
+using ChefKeys;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.UserSettings;
-using System;
+using Flow.Launcher.ViewModel;
 using NHotkey;
 using NHotkey.Wpf;
-using Flow.Launcher.ViewModel;
-using ChefKeys;
-using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Helper;
 
 internal static class HotKeyMapper
 {
     private static readonly string ClassName = nameof(HotKeyMapper);
 
+#pragma warning disable CS8618
     private static Settings _settings;
     private static MainViewModel _mainViewModel;
+#pragma warning restore CS8618
 
     internal static void Initialize()
     {
         _mainViewModel = Ioc.Default.GetRequiredService<MainViewModel>();
-        _settings = Ioc.Default.GetService<Settings>();
+        _settings = Ioc.Default.GetRequiredService<Settings>();
 
         SetHotkey(_settings.Hotkey, OnToggleHotkey);
         LoadCustomPluginHotkey();
     }
 
-    internal static void OnToggleHotkey(object sender, HotkeyEventArgs args)
+    internal static void OnToggleHotkey(object? sender, HotkeyEventArgs args)
     {
         if (!_mainViewModel.ShouldIgnoreHotkeys())
             _mainViewModel.ToggleFlowLauncher();

Flow.Launcher/Helper/SingleInstance.cs

@@ -42,7 +42,7 @@ public static class SingleInstance<TApplication> where TApplication : Applicatio
         /// <summary>
         /// Application mutex.
         /// </summary>
-        internal static Mutex SingleInstanceMutex { get; set; }
+        internal static Mutex? SingleInstanceMutex { get; set; }
 
         #endregion
 

Flow.Launcher/Helper/WpfHelper.cs

@@ -5,7 +5,7 @@ namespace Flow.Launcher.Helper;
 
 public static class WpfHelper
 {
-    public static T FindVisualChild<T>(DependencyObject dep) where T : DependencyObject
+    public static T? FindVisualChild<T>(DependencyObject dep) where T : DependencyObject
     {
         if (dep is null)
             return null;

Flow.Launcher/HotkeyControl.xaml.cs

@@ -215,7 +215,7 @@ private void RefreshHotkeyInterface(string hotkey)
         private static bool CheckHotkeyAvailability(HotkeyModel hotkey, bool validateKeyGesture) =>
             hotkey.Validate(validateKeyGesture) && HotKeyMapper.CheckAvailability(hotkey);
 
-        public string EmptyHotkey => Localize.none();
+        public static string EmptyHotkey => Localize.none();
 
         public ObservableCollection<string> KeysToDisplay { get; set; } = new();
 
@@ -308,7 +308,7 @@ private void SetKeysToDisplay(HotkeyModel? hotkey)
             }
         }
 
-        public void SetHotkey(string? keyStr, bool triggerValidate = true)
+        public void SetHotkey(string keyStr, bool triggerValidate = true)
         {
             SetHotkey(new HotkeyModel(keyStr), triggerValidate);
         }

Flow.Launcher/MainWindow.xaml.cs

@@ -775,7 +775,7 @@ private void QueryTextBox_TextChanged1(object sender, TextChangedEventArgs e)
         {
             var textBox = (TextBox)sender;
             _viewModel.QueryText = textBox.Text;
-            _viewModel.Query(false);
+            _viewModel.Query();
         }
 
         #endregion