Code refactor

Kool.EditProject.Shared/Models/CustomEditor.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using static Kool.EditProject.EditProjectPackage;
 
 namespace Kool.EditProject.Models
 {
@@ -16,17 +17,8 @@ internal sealed class CustomEditor : IFileEditor
         [DllImport("User32.dll")]
         private static extern bool IsIconic(IntPtr hWnd);
 
-        private readonly string _exe;
-        private readonly string _arg;
-
         private static readonly Dictionary<string, int> EditingFiles = new(StringComparer.OrdinalIgnoreCase);
 
-        public CustomEditor(string exe, string arg)
-        {
-            _exe = exe;
-            _arg = arg;
-        }
-
         public void OpenFile(string file)
         {
             if (EditingFiles.TryGetValue(file, out var id))
@@ -49,7 +41,7 @@ public void OpenFile(string file)
                 var process = new Process
                 {
                     EnableRaisingEvents = true,
-                    StartInfo = new ProcessStartInfo(_exe, _arg.Replace("$FILE", file))
+                    StartInfo = new ProcessStartInfo(Options.EditorExe, Options.EditorArg.Replace("$FILE", file))
                 };
                 process.Exited += (_, _) => EditingFiles.Remove(file);
                 process.Start();

Kool.EditProject.Shared/Models/FileEditorFactory.cs

@@ -6,19 +6,7 @@ internal static class FileEditorFactory
     {
         private static IFileEditor CachedEditor;
 
-        public static IFileEditor GetEditor()
-        {
-            return CachedEditor ??= CreateEditor();
-
-#pragma warning disable IDE1006 // Naming Styles
-            static IFileEditor CreateEditor()
-#pragma warning restore IDE1006 // Naming Styles
-            {
-                return Options.UseCustomEditor
-                    ? new CustomEditor(Options.EditorExe, Options.EditorArg)
-                    : new VsEditor();
-            }
-        }
+        public static IFileEditor GetEditor() => CachedEditor ??= Options.UseCustomEditor ? new CustomEditor() : new VsEditor();
 
         public static void ClearCache() => CachedEditor = null;
     }

Kool.EditProject.Shared/Pages/OptionsPage.xaml.cs

@@ -19,7 +19,6 @@ public OptionsPage(Options options)
 
         private void OnBrowseButtonClicked(object sender, RoutedEventArgs e)
         {
-            // TODO: How to localize it?
             var dialog = new OpenFileDialog();
             if (!string.IsNullOrWhiteSpace(_options.EditorExe))
             {
@@ -41,7 +40,7 @@ private void OnTestButtonClicked(object sender, RoutedEventArgs e)
             {
                 var file = Path.GetTempFileName();
                 File.WriteAllText(file, "Hello World");
-                new CustomEditor(_options.EditorExe, _options.EditorArg).OpenFile(file);
+                new CustomEditor().OpenFile(file);
             }
             catch (Exception ex)
             {