Merge pull request #362 from daemitus/StyleCop-mini-4

Dalamud/Interface/Windowing/Window.cs

@@ -1,7 +1,6 @@
 using System.Numerics;
 
 using ImGuiNET;
-using Serilog;
 
 namespace Dalamud.Interface.Windowing
 {
@@ -12,7 +11,6 @@ namespace Dalamud.Interface.Windowing
     {
         private bool internalLastIsOpen = false;
         private bool internalIsOpen = false;
-        private bool mainIsOpen = false;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Window"/> class.
@@ -30,6 +28,9 @@ namespace Dalamud.Interface.Windowing
             this.ForceMainWindow = forceMainWindow;
         }
 
+        /// <summary>
+        /// Gets or sets the namespace of the window.
+        /// </summary>
         public string Namespace { get; set; }
 
         /// <summary>
@@ -115,20 +116,27 @@ namespace Dalamud.Interface.Windowing
         }
 
         /// <summary>
+        /// Code to be executed every time the window renders.
+        /// </summary>
+        /// <remarks>
         /// In this method, implement your drawing code.
         /// You do NOT need to ImGui.Begin your window.
-        /// </summary>
+        /// </remarks>
         public abstract void Draw();
 
         /// <summary>
         /// Code to be executed when the window is opened.
         /// </summary>
-        public virtual void OnOpen() { }
+        public virtual void OnOpen()
+        {
+        }
 
         /// <summary>
         /// Code to be executed when the window is closed.
         /// </summary>
-        public virtual void OnClose() { }
+        public virtual void OnClose()
+        {
+        }
 
         /// <summary>
         /// Draw the window via ImGui.

Dalamud/Interface/Windowing/WindowSystem.cs

@@ -12,7 +12,7 @@ namespace Dalamud.Interface.Windowing
     /// </summary>
     public class WindowSystem
     {
-        private readonly List<Window> windows = new List<Window>();
+        private readonly List<Window> windows = new();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WindowSystem"/> class.

Dalamud/Localization.cs

@@ -41,7 +41,7 @@ namespace Dalamud
         }
 
         /// <summary>
-        /// Delegate for the <see cref="Localization.OnLocalizationChanged"/> event that occurs when the language is changed.
+        /// Delegate for the <see cref="OnLocalizationChanged"/> event that occurs when the language is changed.
         /// </summary>
         /// <param name="langCode">The language code of the new language.</param>
         public delegate void LocalizationChangedDelegate(string langCode);
@@ -51,6 +51,19 @@ namespace Dalamud
         /// </summary>
         public event LocalizationChangedDelegate OnLocalizationChanged;
 
+        /// <summary>
+        /// Search the set-up localization data for the provided assembly for the given string key and return it.
+        /// If the key is not present, the fallback is shown.
+        /// The fallback is also required to create the string files to be localized.
+        /// </summary>
+        /// <param name="key">The string key to be returned.</param>
+        /// <param name="fallBack">The fallback string, usually your source language.</param>
+        /// <returns>The localized string, fallback or string key if not found.</returns>
+        public static string Localize(string key, string fallBack)
+        {
+            return Loc.Localize(key, fallBack, Assembly.GetCallingAssembly());
+        }
+
         /// <summary>
         /// Set up the UI language with the users' local UI culture.
         /// </summary>
@@ -118,19 +131,6 @@ namespace Dalamud
             Loc.ExportLocalizableForAssembly(this.assembly);
         }
 
-        /// <summary>
-        /// Search the set-up localization data for the provided assembly for the given string key and return it.
-        /// If the key is not present, the fallback is shown.
-        /// The fallback is also required to create the string files to be localized.
-        /// </summary>
-        /// <param name="key">The string key to be returned.</param>
-        /// <param name="fallBack">The fallback string, usually your source language.</param>
-        /// <returns>The localized string, fallback or string key if not found.</returns>
-        public static string Localize(string key, string fallBack)
-        {
-            return Loc.Localize(key, fallBack, Assembly.GetCallingAssembly());
-        }
-
         private string ReadLocData(string langCode)
         {
             if (this.useEmbedded)

Dalamud/Plugin/DalamudPluginInterface.cs

@@ -94,7 +94,7 @@ namespace Dalamud.Plugin
         /// <summary>
         /// Gets the directory your plugin configurations are stored in.
         /// </summary>
-        public DirectoryInfo ConfigDirectory => new DirectoryInfo(this.GetPluginConfigDirectory());
+        public DirectoryInfo ConfigDirectory => new(this.GetPluginConfigDirectory());
 
         /// <summary>
         /// Gets the config file of your plugin.

Dalamud/Plugin/IDalamudPlugin.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Dalamud.Plugin
 {

Dalamud/Plugin/PluginLoadReason.cs

@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Dalamud.Plugin
 {
     /// <summary>

Dalamud/Plugin/PluginLog.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Diagnostics;
 using System.Reflection;
 
-using Serilog;
-using Serilog.Events;
-
 namespace Dalamud.Plugin
 {
     /// <summary>

Dalamud/SafeMemory.cs

@@ -12,7 +12,7 @@ namespace Dalamud
     /// </summary>
     /// <remarks>
     /// Attention! The performance of these methods is severely worse than regular <see cref="Marshal"/> calls.
-    /// Please consider using these instead in performance-critical code.
+    /// Please consider using those instead in performance-critical code.
     /// </remarks>
     public static class SafeMemory
     {

Dalamud/Troubleshooting.cs

@@ -37,9 +37,8 @@ namespace Dalamud
                     ThirdRepo = dalamud.Configuration.ThirdRepoList,
                 };
 
-                Log.Information("TROUBLESHOOTING:" +
+                var encodedPayload = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(payload)));
-                                System.Convert.ToBase64String(
+                Log.Information($"TROUBLESHOOTING:{encodedPayload}");
-                                    Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(payload))));
             }
             catch (Exception ex)
             {

Dalamud/stylecop.json

@@ -1,9 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
     "settings": {
-        "documentationRules": {
-            
-        },
         "orderingRules": {
             "systemUsingDirectivesFirst": true,
             "usingDirectivesPlacement": "outsideNamespace",