refactoring

Author: Sébastien Geiser

CSharpRegexTools4Npp/Main.cs

@@ -81,7 +81,7 @@ internal static void SetToolBarIcon()
                 && int.TryParse(Npp.NotepadPP.NppBinVersion.Split('.')[0], out int majorVersion)
                 && majorVersion >= 8)
             {
-                toolbarIconsWithDarkMode tbIcons = new toolbarIconsWithDarkMode
+                toolbarIconsWithDarkMode tbIcons = new()
                 {
                     hToolbarBmp = tbBmp.GetHbitmap(),
                     hToolbarIcon = tbBmp.GetHicon(),
@@ -95,7 +95,7 @@ internal static void SetToolBarIcon()
             }
             else
             {
-                toolbarIcons tbIcons = new toolbarIcons
+                toolbarIcons tbIcons = new()
                 {
                     hToolbarBmp = tbBmp.GetHbitmap(),
                     hToolbarIcon = tbBmp.GetHicon(),
@@ -120,7 +120,7 @@ private static async void CheckUpdates(RegExToolDialog dialog)
 
                 try
                 {
-                    HttpClient client = new HttpClient();
+                    HttpClient client = new();
                     client.DefaultRequestHeaders.Add("Accept-Language", "en-US;q=0.5,en;q=0.3");
                     client.DefaultRequestHeaders.Add("User-Agent", "C# App");
 

CSharpRegexTools4Npp/Npp.cs

@@ -8,7 +8,7 @@ public static class Npp
     {
         public static NotepadPPGateway NotepadPP { get; } = new NotepadPPGateway();
 
-        public static ScintillaGateway Scintilla => new ScintillaGateway(PluginBase.GetCurrentScintilla());
+        public static ScintillaGateway Scintilla => new(PluginBase.GetCurrentScintilla());
 
         /// <summary>
         /// Récupère les caractères de fin de lignes courant

CSharpRegexTools4Npp/PluginInfrastructure/ClikeStringArray.cs

@@ -41,7 +41,7 @@ public ClikeStringArray(List<string> lstStrings)
         public List<string> ManagedStringsUnicode { get { return _getManagedItems(true); } }
         List<string> _getManagedItems(bool unicode)
         {
-            List<string> _managedItems = new List<string>();
+            List<string> _managedItems = new();
             for (int i = 0; i < _nativeItems.Count; i++)
             {
                 if (unicode) _managedItems.Add(Marshal.PtrToStringUni(_nativeItems[i]));

CSharpRegexTools4Npp/PluginInfrastructure/NppPluginNETBase.cs

@@ -6,7 +6,7 @@ namespace CSharpRegexTools4Npp.PluginInfrastructure
     public class PluginBase
     {
         public static NppData nppData;
-        public static FuncItems _funcItems = new FuncItems();
+        public static FuncItems _funcItems = new();
 
         public static void SetCommand(int index, string commandName, NppFuncItemDelegate functionPointer)
         {
@@ -25,7 +25,7 @@ public static void SetCommand(int index, string commandName, NppFuncItemDelegate
 
         public static void SetCommand(int index, string commandName, NppFuncItemDelegate functionPointer, ShortcutKey shortcut, bool checkOnInit)
         {
-            FuncItem funcItem = new FuncItem
+            FuncItem funcItem = new()
             {
                 _cmdID = index,
                 _itemName = commandName

CSharpRegexTools4Npp/PluginInfrastructure/NppPluginNETHelper.cs

@@ -125,7 +125,7 @@ public void RefreshItems()
             IntPtr ptrPosItem = _nativePointer;
             for (int i = 0; i < _funcItems.Count; i++)
             {
-                FuncItem updatedItem = new FuncItem();
+                FuncItem updatedItem = new();
                 updatedItem._itemName = _funcItems[i]._itemName;
                 ptrPosItem = (IntPtr)(ptrPosItem.ToInt64() + 128);
                 updatedItem._pFunc = _funcItems[i]._pFunc;

CSharpRegexTools4Npp/PluginInfrastructure/ScintillaGateway.cs

@@ -76,7 +76,7 @@ public int GetCurrentLineNumber()
         /// <returns>A ScrollInfo struct with information of the current scroll state</returns>
         public ScrollInfo GetScrollInfo(ScrollInfoMask mask = ScrollInfoMask.SIF_ALL, ScrollInfoBar scrollBar = ScrollInfoBar.SB_BOTH)
         {
-            ScrollInfo scrollInfo = new ScrollInfo();
+            ScrollInfo scrollInfo = new();
             scrollInfo.cbSize = (uint)Marshal.SizeOf(scrollInfo);
             scrollInfo.fMask = (uint)mask;
             Win32.GetScrollInfo(scintilla, (int)scrollBar, ref scrollInfo);

RegexDialog/Model/ExcelSheetSelection.cs

@@ -12,11 +12,11 @@ namespace RegexDialog
 {
     public class ExcelSheetSelection : NotifyPropertyChangedBaseClass
     {
-        private readonly static Regex simpleCellRegex = new Regex("^[A-Z]+[1-9][0-9]*$", RegexOptions.Compiled);
-        private readonly static Regex simpleColumnRegex = new Regex("^[A-Z]+$", RegexOptions.Compiled);
-        private readonly static Regex simpleRowRegex = new Regex("^[1-9][0-9]*$", RegexOptions.Compiled);
-        private readonly static Regex rangeRegex = new Regex("^[A-Z]+([1-9][0-9]*)?:[A-Z]+([1-9][0-9]*)?|[1-9][0-9]*:[1-9][0-9]*$", RegexOptions.Compiled);
-        private readonly static Regex evaluatedExpressionRegex = new Regex(@"\{(?<expression>[^\}]*)\}", RegexOptions.Compiled);
+        private readonly static Regex simpleCellRegex = new("^[A-Z]+[1-9][0-9]*$", RegexOptions.Compiled);
+        private readonly static Regex simpleColumnRegex = new("^[A-Z]+$", RegexOptions.Compiled);
+        private readonly static Regex simpleRowRegex = new("^[1-9][0-9]*$", RegexOptions.Compiled);
+        private readonly static Regex rangeRegex = new("^[A-Z]+([1-9][0-9]*)?:[A-Z]+([1-9][0-9]*)?|[1-9][0-9]*:[1-9][0-9]*$", RegexOptions.Compiled);
+        private readonly static Regex evaluatedExpressionRegex = new(@"\{(?<expression>[^\}]*)\}", RegexOptions.Compiled);
 
         public bool IsSelected { get; set; } = true;
         public string Name { get; set; } = string.Empty;
@@ -78,7 +78,7 @@ public IEnumerable<IXLCell> GetCells(IXLWorksheet sheet)
 
         private string InterpretStuffInFilter(string filter, IXLWorksheet sheet)
         {
-            ExpressionEvaluator evaluator = new ExpressionEvaluator(new Dictionary<string, object>()
+            ExpressionEvaluator evaluator = new(new Dictionary<string, object>()
             {
                 { "FR", sheet.FirstRowUsed().RangeAddress.FirstAddress.RowNumber },
                 { "LR", sheet.LastRowUsed().RangeAddress.FirstAddress.RowNumber },