add membernotnull attribute and small refactor

Author: taooceros

Plugins/Flow.Launcher.Plugin.Explorer/Main.cs

@@ -1,14 +1,11 @@
-using Flow.Launcher.Infrastructure.Storage;
-using Flow.Launcher.Plugin.Explorer.Helper;
+using Flow.Launcher.Plugin.Explorer.Helper;
 using Flow.Launcher.Plugin.Explorer.Search;
 using Flow.Launcher.Plugin.Explorer.Search.Everything;
-using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks;
 using Flow.Launcher.Plugin.Explorer.ViewModels;
 using Flow.Launcher.Plugin.Explorer.Views;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -55,7 +52,7 @@ public Task InitAsync(PluginInitContext context)
                             Settings.EverythingInstalledPath = s.Result;
                     }, TaskScheduler.Default);
             }
-
+            
             SortOptionTranslationHelper.API = context.API;
 
             EverythingApiDllImport.Load(Path.Combine(Context.CurrentPluginMetadata.PluginDirectory, "EverythingSDK",

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

@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Windows;
@@ -82,15 +83,21 @@ public EnumBindingModel<Settings.PathEnumerationEngineOption> SelectedPathEnumer
             }
         }
 
+        [MemberNotNull(nameof(IndexSearchEngines),
+            nameof(ContentIndexSearchEngines),
+            nameof(PathEnumerationEngines),
+            nameof(_selectedIndexSearchEngine),
+            nameof(_selectedContentSearchEngine),
+            nameof(_selectedPathEnumerationEngine))]
         private void InitializeEngineSelection()
         {
             IndexSearchEngines = EnumBindingModel<Settings.IndexSearchEngineOption>.CreateList();
             ContentIndexSearchEngines = EnumBindingModel<Settings.ContentIndexSearchEngineOption>.CreateList();
             PathEnumerationEngines = EnumBindingModel<Settings.PathEnumerationEngineOption>.CreateList();
 
-            SelectedIndexSearchEngine = IndexSearchEngines.First(x => x.Value == Settings.IndexSearchEngine);
-            SelectedContentSearchEngine = ContentIndexSearchEngines.First(x => x.Value == Settings.ContentSearchEngine);
-            SelectedPathEnumerationEngine = PathEnumerationEngines.First(x => x.Value == Settings.PathEnumerationEngine);
+            _selectedIndexSearchEngine = IndexSearchEngines.First(x => x.Value == Settings.IndexSearchEngine);
+            _selectedContentSearchEngine = ContentIndexSearchEngines.First(x => x.Value == Settings.ContentSearchEngine);
+            _selectedPathEnumerationEngine = PathEnumerationEngines.First(x => x.Value == Settings.PathEnumerationEngine);
         }
 
         #endregion
@@ -99,6 +106,7 @@ private void InitializeEngineSelection()
 
         #region ActionKeyword
 
+        [MemberNotNull(nameof(ActionKeywordsModels))]
         private void InitializeActionKeywordModels()
         {
             ActionKeywordsModels = new List<ActionKeywordModel>
@@ -307,7 +315,7 @@ internal static void OpenWindowsIndexingOptions()
             Process.Start(psi);
         }
 
-        private ICommand _openEditorPathCommand;
+        private ICommand? _openEditorPathCommand;
 
         public ICommand OpenEditorPath => _openEditorPathCommand ??= new RelayCommand(_ =>
         {
@@ -318,7 +326,7 @@ internal static void OpenWindowsIndexingOptions()
             EditorPath = path;
         });
 
-        private ICommand _openShellPathCommand;
+        private ICommand? _openShellPathCommand;
 
         public ICommand OpenShellPath => _openShellPathCommand ??= new RelayCommand(_ =>
         {