Больше обработчиков

Pf2eViewer/MainViewForm.cs

@@ -29,7 +29,7 @@ public partial class MainViewForm : Form
         TypesListBox.SelectedIndex = 0;
     }
 
-    private void TypesListBox_SelectedIndexChanged(object sender, EventArgs e)
+    private void TypesListBox_SelectedIndexChanged(object sender, EventArgs _)
     {
         if (TypesListBox.SelectedItem is null)
         {
@@ -39,7 +39,10 @@ public partial class MainViewForm : Form
         EntityGridView.DataSource = Context.Entities
             .Where(e => e.Type == (EntityType) TypesListBox.SelectedItem)
             .OrderBy(e => e.Id)
-            .Include(e => e.Sources).Include(e => e.Aliases).Include(e => e.Keywords).Include(e => e.Externals)
+            .Include(e => e.Sources)
+            .Include(e => e.Aliases)
+            .Include(e => e.Keywords)
+            .Include(e => e.Externals)
             .Include(e => e.Traits)
             .Select(e => new EntityGridRow(e))
             .ToList();
@@ -49,7 +52,7 @@ public partial class MainViewForm : Form
     private void EntityGridView_RowStateChanged(object sender, DataGridViewRowStateChangedEventArgs e)
     {
         int rowsCount = EntityGridView.SelectedRows.Count;
-        if (rowsCount == 0 || rowsCount > 1)
+        if (rowsCount is 0 or > 1)
         {
             return;
         }
@@ -62,23 +65,22 @@ public partial class MainViewForm : Form
 
         JsonToTreeview(EntityTreeView, json, "Entity");
 
-        DescriptionTextBox.Text = data.GetEntity().Description;
+        DescriptionTextBox.Text = data.GetEntity().Description.Replace("\\r", "").Replace("\\n", "\\r\\n");
     }
 
     public string SerializeEntity(Entity entity)
     {
-        JsonSerializerSettings settings = new JsonSerializerSettings()
+        JsonSerializerSettings settings = new()
         {
-            Converters = [new EntityConventor()]
-            // ContractResolver = new CamelCasePropertyNamesContractResolver(),
+            Converters = [new EntityConverter()]
         };
 
         string result = JsonConvert.SerializeObject(entity, settings);
 
         Type type = EntityOfTypeAttribute.Resolve(entity);
-        string subReuslt = JsonConvert.SerializeObject(Context.Find(type, entity.Id), settings);
+        string subResult = JsonConvert.SerializeObject(Context.Find(type, entity.Id), settings);
 
-        return result[..^1] + $",\"SubEntity\":{subReuslt}}}";
+        return result[..^1] + $",\"SubEntity\":{subResult}}}";
     }
 
 
@@ -114,10 +116,7 @@ public partial class MainViewForm : Form
             case "JArray":
                 JArray jArray = (JArray) element;
                 int i = 0;
-                foreach (JToken oJtok in jArray)
-                {
-                    subNodes.Add(Element2TreeNode(oJtok, string.Format("[{0}]", i++)));
-                }
+                subNodes.AddRange(jArray.Select(token => Element2TreeNode(token, $"[{i++}]")));
 
                 if (i == 0)
                 {
@@ -147,17 +146,11 @@ public partial class MainViewForm : Form
         return treeNode;
     }
 
-
-
-
-
-
     private class EntityGridRow(Entity e)
     {
         public int Id { get; set; } = e.Id;
         public string Name { get; set; } = e.Name;
-        //public string Slug { get; set; } = e.Slug;
-        //public EntityRarity Rarity { get; set; } = e.Rarity;
+        public EntityRarity Rarity { get; set; } = e.Rarity;
 
         private readonly Entity _e = e;
         public Entity GetEntity() => _e;