Code style tweaks

2023-03-26 15:47:18 +02:00 · 2023-03-26 15:47:18 +02:00 · b81ced33e8
commit b81ced33e8
parent 87806397d1
25 changed files with 273 additions and 235 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,31 @@
+root = true
+
+[*]
+indent_style = space
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{*.cs}]
+charset = utf-8-bom
+indent_size = 4
+dotnet_sort_system_directives_first = true
+csharp_style_implicit_object_creation_when_type_is_apparent = true
+csharp_trailing_comma_in_multiline_lists = true
+csharp_place_simple_embedded_block_on_same_line = false
+csharp_place_attribute_on_same_line = false
+
+resharper_indent_text = ZeroIndent
+
+# methods
+csharp_style_expression_bodied_methods = true
+
+# namespaces
+csharp_style_namespace_declarations = block_scoped
+
+# braces
+csharp_prefer_braces = when_multiline
+
+[{*.resx,*.Designer.cs,packages.lock.json}]
+generated_code = true
+ij_formatter_enabled = false
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@ -8,7 +8,7 @@ on:
      - 'Pal.Common/**'
      - 'Pal.Server/**'
      - 'Dockerfile'
-  workflow_dispatch: {}
+  workflow_dispatch: { }
 permissions:
  packages: write
 jobs:
--- a/.github/workflows/upload-crowdin.yml
+++ b/.github/workflows/upload-crowdin.yml
@ -6,7 +6,7 @@ on:
    paths:
      - 'Pal.Client/Properties/*.resx'
      - 'crowdin.yml'
-  workflow_dispatch: {}
+  workflow_dispatch: { }
 jobs:
  build:
    runs-on: ubuntu-latest
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -5,6 +5,6 @@
    </PropertyGroup>

    <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(SignToolPath)' != '' And Exists('$(SolutionDir)codesigning.pfx')">
-    <Exec Command="&quot;$(SignToolPath)signtool.exe&quot; sign /f $(SolutionDir)codesigning.pfx /t http://timestamp.digicert.com /fd SHA256 &quot;$(TargetPath)&quot;" />
+        <Exec Command="&quot;$(SignToolPath)signtool.exe&quot; sign /f $(SolutionDir)codesigning.pfx /t http://timestamp.digicert.com /fd SHA256 &quot;$(TargetPath)&quot;"/>
    </Target>
 </Project>
--- a/Pal.Client/Configuration/EMode.cs
+++ b/Pal.Client/Configuration/EMode.cs
@ -8,7 +8,7 @@
        Online = 1,

        /// <summary>
-        /// Only shows traps found by yourself uisng a pomander of sight.
+        /// Only shows traps found by yourself using a pomander of sight.
        /// </summary>
        Offline = 2,
    }
--- a/Pal.Client/Configuration/Legacy/JsonFloorState.cs
+++ b/Pal.Client/Configuration/Legacy/JsonFloorState.cs
@ -19,7 +19,9 @@ namespace Pal.Client.Configuration.Legacy
        private const int CurrentVersion = 4;

        private static string _pluginConfigDirectory = null!;
-        private static readonly EMode _mode = EMode.Online; // might not be true, but this is 'less strict filtering' for migrations
+
+        // might not be true, but this is 'less strict filtering' for migrations
+        private static readonly EMode _mode = EMode.Online;

        internal static void SetContextProperties(string pluginConfigDirectory)
        {
--- a/Pal.Client/Net/JwtClaims.cs
+++ b/Pal.Client/Net/JwtClaims.cs
@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Text.Json.Serialization;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;

 namespace Pal.Client.Net
--- a/Pal.Client/Net/RemoteApi.AccountService.cs
+++ b/Pal.Client/Net/RemoteApi.AccountService.cs
@ -1,16 +1,16 @@
-using Account;
-using Grpc.Core;
-using Grpc.Net.Client;
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Account;
+using Grpc.Core;
+using Grpc.Net.Client;
+using Microsoft.Extensions.Logging;
+using Pal.Client.Configuration;
 using Pal.Client.Extensions;
 using Pal.Client.Properties;
-using Pal.Client.Configuration;

 namespace Pal.Client.Net
 {
--- a/Pal.Client/Net/RemoteApi.ExportService.cs
+++ b/Pal.Client/Net/RemoteApi.ExportService.cs
@ -1,7 +1,7 @@
-using Export;
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Export;

 namespace Pal.Client.Net
 {
--- a/Pal.Client/Net/RemoteApi.PalaceService.cs
+++ b/Pal.Client/Net/RemoteApi.PalaceService.cs
@ -1,5 +1,4 @@
-using Palace;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
@ -7,6 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Pal.Client.Database;
 using Pal.Client.Floors;
+using Palace;

 namespace Pal.Client.Net
 {
--- a/Pal.Client/Net/RemoteApi.Utils.cs
+++ b/Pal.Client/Net/RemoteApi.Utils.cs
@ -1,8 +1,8 @@
 using System;
-using Dalamud.Logging;
-using Grpc.Core;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
+using Dalamud.Logging;
+using Grpc.Core;
 using Microsoft.Extensions.Logging;

 namespace Pal.Client.Net
--- a/Pal.Client/Net/RemoteApi.cs
+++ b/Pal.Client/Net/RemoteApi.cs
@ -1,8 +1,8 @@
-using Dalamud.Logging;
+using System;
+using Dalamud.Game.Gui;
+using Dalamud.Logging;
 using Grpc.Net.Client;
 using Microsoft.Extensions.Logging;
-using System;
-using Dalamud.Game.Gui;
 using Pal.Client.Configuration;
 using Pal.Client.DependencyInjection;

--- a/Pal.Client/Pal.Client.csproj
+++ b/Pal.Client/Pal.Client.csproj
@ -29,18 +29,18 @@
    </PropertyGroup>

    <ItemGroup Condition="'$(Configuration)' == 'Release' And Exists('Certificate.pfx')">
-		<None Remove="Certificate.pfx" />
+        <None Remove="Certificate.pfx"/>
    </ItemGroup>

    <ItemGroup Condition="'$(Configuration)' == 'Release' And Exists('Certificate.pfx')">
-		<EmbeddedResource Include="Certificate.pfx" />
+        <EmbeddedResource Include="Certificate.pfx"/>
    </ItemGroup>

    <ItemGroup>
-		<PackageReference Include="DalamudPackager" Version="2.1.10" />
-		<PackageReference Include="Dalamud.Extensions.MicrosoftLogging" Version="1.0.0" />
-		<PackageReference Include="Google.Protobuf" Version="3.22.1" />
-		<PackageReference Include="Grpc.Net.Client" Version="2.51.0" />
+        <PackageReference Include="DalamudPackager" Version="2.1.10"/>
+        <PackageReference Include="Dalamud.Extensions.MicrosoftLogging" Version="1.0.0"/>
+        <PackageReference Include="Google.Protobuf" Version="3.22.1"/>
+        <PackageReference Include="Grpc.Net.Client" Version="2.51.0"/>
        <PackageReference Include="GitInfo" Version="2.3.0">
            <PrivateAssets>all</PrivateAssets>
        </PackageReference>
@ -48,24 +48,24 @@
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3"/>
        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.3">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-		<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0"/>
+        <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1"/>
    </ItemGroup>

    <ItemGroup>
-	  <ProjectReference Include="..\Pal.Common\Pal.Common.csproj" />
-	  <ProjectReference Include="..\vendor\ECommons\ECommons\ECommons.csproj" />
+        <ProjectReference Include="..\Pal.Common\Pal.Common.csproj"/>
+        <ProjectReference Include="..\vendor\ECommons\ECommons\ECommons.csproj"/>
    </ItemGroup>

    <ItemGroup>
-		<Protobuf Include="..\Pal.Common\Protos\account.proto" Link="Protos\account.proto" GrpcServices="Client" Access="Internal" />
-		<Protobuf Include="..\Pal.Common\Protos\palace.proto" Link="Protos\palace.proto" GrpcServices="Client" Access="Internal" />
-		<Protobuf Include="..\Pal.Common\Protos\export.proto" Link="Protos\export.proto" GrpcServices="Client" Access="Internal" />
+        <Protobuf Include="..\Pal.Common\Protos\account.proto" Link="Protos\account.proto" GrpcServices="Client" Access="Internal"/>
+        <Protobuf Include="..\Pal.Common\Protos\palace.proto" Link="Protos\palace.proto" GrpcServices="Client" Access="Internal"/>
+        <Protobuf Include="..\Pal.Common\Protos\export.proto" Link="Protos\export.proto" GrpcServices="Client" Access="Internal"/>
    </ItemGroup>

    <ItemGroup>
@ -124,10 +124,10 @@
    </Target>

    <Target Name="RenameLatestZip" AfterTargets="PackagePlugin" Condition="'$(Configuration)' == 'Release'">
-		<Exec Command="rename &quot;$(OutDir)$(AssemblyName)\latest.zip&quot; &quot;$(AssemblyName)-$(Version).zip&quot;" />
+        <Exec Command="rename &quot;$(OutDir)$(AssemblyName)\latest.zip&quot; &quot;$(AssemblyName)-$(Version).zip&quot;"/>
    </Target>

    <Target Name="Clean">
-		<RemoveDir Directories="dist" />
+        <RemoveDir Directories="dist"/>
    </Target>
 </Project>
--- a/Pal.Client/Palace
+++ b/Pal.Client/Palace
@ -5,5 +5,10 @@
  "Description": "Shows possible trap & hoard coffer locations in Palace of the Dead & Heaven on High.\n\nThe default configuration requires Splatoon to be installed. If you do not wish to install Splatoon, you can switch to the experimental 'Simple' renderer in the configuration.",
  "RepoUrl": "https://github.com/carvelli/PalacePal",
  "IconUrl": "https://raw.githubusercontent.com/carvelli/Dalamud-Plugins/master/dist/Palace Pal.png",
-  "Tags": [ "potd", "palace", "hoh", "splatoon" ]
+  "Tags": [
+    "potd",
+    "palace",
+    "hoh",
+    "splatoon"
+  ]
 }
--- a/Pal.Client/Plugin.cs
+++ b/Pal.Client/Plugin.cs
@ -1,7 +1,4 @@
-using Dalamud.Interface.Windowing;
-using Dalamud.Plugin;
-using Pal.Client.Rendering;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@ -12,7 +9,8 @@ using Dalamud.Game;
 using Dalamud.Game.ClientState;
 using Dalamud.Game.Command;
 using Dalamud.Game.Gui;
-using Pal.Client.Properties;
+using Dalamud.Interface.Windowing;
+using Dalamud.Plugin;
 using ECommons;
 using ECommons.DalamudServices;
 using Microsoft.Extensions.DependencyInjection;
@ -20,6 +18,8 @@ using Microsoft.Extensions.Logging;
 using Pal.Client.Commands;
 using Pal.Client.Configuration;
 using Pal.Client.DependencyInjection;
+using Pal.Client.Properties;
+using Pal.Client.Rendering;

 namespace Pal.Client
 {
--- a/Pal.Client/Rendering/SimpleRenderer.cs
+++ b/Pal.Client/Rendering/SimpleRenderer.cs
@ -1,12 +1,12 @@
-using Dalamud.Interface;
-using ImGuiNET;
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using Dalamud.Game.ClientState;
 using Dalamud.Game.Gui;
+using Dalamud.Interface;
+using ImGuiNET;
 using Pal.Client.Configuration;
 using Pal.Client.DependencyInjection;
 using Pal.Client.Floors;
--- a/Pal.Client/Rendering/SplatoonRenderer.cs
+++ b/Pal.Client/Rendering/SplatoonRenderer.cs
@ -1,15 +1,15 @@
-using Dalamud.Plugin;
-using ECommons;
-using ECommons.Reflection;
-using ECommons.Schedulers;
-using ECommons.SplatoonAPI;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using System.Reflection;
 using Dalamud.Game.ClientState;
+using Dalamud.Plugin;
+using ECommons;
+using ECommons.Reflection;
+using ECommons.Schedulers;
+using ECommons.SplatoonAPI;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Configuration;
 using Pal.Client.DependencyInjection;
--- a/Pal.Client/Scheduled/QueuedImport.cs
+++ b/Pal.Client/Scheduled/QueuedImport.cs
@ -1,14 +1,14 @@
-using Export;
-using Pal.Common;
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
+using Export;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Pal.Client.Database;
 using Pal.Client.DependencyInjection;
 using Pal.Client.Properties;
 using Pal.Client.Windows;
+using Pal.Common;

 namespace Pal.Client.Scheduled
 {
--- a/Pal.Client/Windows/AgreementWindow.cs
+++ b/Pal.Client/Windows/AgreementWindow.cs
@ -1,9 +1,9 @@
 using System;
+using System.Numerics;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Windowing;
 using ECommons;
 using ImGuiNET;
-using System.Numerics;
 using Pal.Client.Configuration;
 using Pal.Client.Extensions;
 using Pal.Client.Properties;
--- a/Pal.Client/Windows/ConfigWindow.cs
+++ b/Pal.Client/Windows/ConfigWindow.cs
@ -1,27 +1,27 @@
-using Export;
-using Dalamud.Interface;
-using Dalamud.Interface.Components;
-using Dalamud.Interface.ImGuiFileDialog;
-using Dalamud.Interface.Windowing;
-using ECommons;
-using Google.Protobuf;
-using ImGuiNET;
-using Pal.Client.Net;
-using Pal.Client.Rendering;
-using Pal.Client.Scheduled;
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Numerics;
 using System.Threading;
 using System.Threading.Tasks;
+using Dalamud.Interface;
+using Dalamud.Interface.Components;
+using Dalamud.Interface.ImGuiFileDialog;
+using Dalamud.Interface.Windowing;
+using ECommons;
+using Export;
+using Google.Protobuf;
+using ImGuiNET;
 using Microsoft.Extensions.Logging;
-using Pal.Client.Extensions;
-using Pal.Client.Properties;
 using Pal.Client.Configuration;
 using Pal.Client.Database;
 using Pal.Client.DependencyInjection;
+using Pal.Client.Extensions;
 using Pal.Client.Floors;
+using Pal.Client.Net;
+using Pal.Client.Properties;
+using Pal.Client.Rendering;
+using Pal.Client.Scheduled;

 namespace Pal.Client.Windows
 {
--- a/Pal.Client/Windows/StatisticsWindow.cs
+++ b/Pal.Client/Windows/StatisticsWindow.cs
@ -1,12 +1,12 @@
-using Dalamud.Interface.Windowing;
-using ImGuiNET;
-using Pal.Common;
-using Palace;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
+using Dalamud.Interface.Windowing;
+using ImGuiNET;
 using Pal.Client.Properties;
+using Pal.Common;
+using Palace;

 namespace Pal.Client.Windows
 {
--- a/Pal.sln
+++ b/Pal.sln
@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		Dockerfile = Dockerfile
 		README.md = README.md
+		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ECommons", "vendor\ECommons\ECommons\ECommons.csproj", "{D0B37096-5BC3-41B0-8D81-203CBA3932B0}"
--- a/README.md
+++ b/README.md
@ -10,7 +10,6 @@ To install this plugin from my plugin repository, please check the
 Additionally, you **need to install Splatoon**, which is used to render the visible overlays.
 Please check [Splatoon's Installation Instructions](https://github.com/NightmareXIV/MyDalamudPlugins#installation).

-
 ## Translation

 Please feel free to help by [translating this plugin into your language](https://crowdin.com/project/palace-pal).