From a1811b4b04244ab35c380a21e5ecbd2a3704b6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20C=C3=A1ceres?= Date: Sun, 8 May 2022 17:39:06 +0200 Subject: [PATCH] Add fixed issues as warnings to .editorconfig --- .editorconfig | 36 +++++++++++++++++++++++++++++ OpenRA.Mods.Cnc/Traits/Minelayer.cs | 8 ------- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/.editorconfig b/.editorconfig index 7294066eec..3bc5a4395e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -132,6 +132,9 @@ dotnet_diagnostic.IDE0011.severity = silent # Object initialization can be simplified / Use object initializer. dotnet_diagnostic.IDE0017.severity = warning +# Collection initialization can be simplified +dotnet_diagnostic.IDE0028.severity = warning + # Modifiers are not ordered. dotnet_diagnostic.IDE0036.severity = warning @@ -157,3 +160,36 @@ dotnet_diagnostic.CA1847.severity = warning [*.yaml] indent_style = tab indent_size = 4 + +# Use 'Count' property instead of 'Any' method. +dotnet_diagnostic.RCS1080.severity = warning + +# Use the "Length" property instead of Enumerable.Count(). +dotnet_diagnostic.CA1829.severity = warning + +# Use read-only auto-implemented property. +dotnet_diagnostic.RCS1170.severity = warning + +# Unnecessary interpolated string. +dotnet_diagnostic.RCS1214.severity = warning + +# Unnecessary usage of verbatim string literal. +dotnet_diagnostic.RCS1192.severity = warning + +# Use pattern matching instead of combination of 'as' operator and null check. +dotnet_diagnostic.RCS1221.severity = warning + +# Expression is always equal to 'true'. +dotnet_diagnostic.RCS1215.severity = warning + +# Use StringComparison when comparing strings. +dotnet_diagnostic.RCS1155.severity = warning + +# Abstract type should not have public constructors. +dotnet_diagnostic.RCS1160.severity = warning + +# Optimize 'Dictionary.ContainsKey' call. +dotnet_diagnostic.RCS1235.severity = warning + +# Call extension method as instance method. +dotnet_diagnostic.RCS1196.severity = warning diff --git a/OpenRA.Mods.Cnc/Traits/Minelayer.cs b/OpenRA.Mods.Cnc/Traits/Minelayer.cs index 5a6192394c..2c9e3cd53f 100644 --- a/OpenRA.Mods.Cnc/Traits/Minelayer.cs +++ b/OpenRA.Mods.Cnc/Traits/Minelayer.cs @@ -145,8 +145,6 @@ namespace OpenRA.Mods.Cnc.Traits // A different minelayer might have started laying the field without this minelayer knowing the start minefieldStart = order.ExtraLocation; -#pragma warning disable IDE0019 // Use pattern matching - var movement = self.Trait(); var mobile = movement as Mobile; @@ -155,8 +153,6 @@ namespace OpenRA.Mods.Cnc.Traits && movement.CanEnterCell(c, null, BlockedByActor.Immovable) && (mobile != null && mobile.CanStayInCell(c))) .OrderBy(c => (c - minefieldStart).LengthSquared).ToList(); -#pragma warning restore IDE0019 // Use pattern matching - self.QueueActivity(order.Queued, new LayMines(self, minefield)); self.ShowTargetLines(); } @@ -309,8 +305,6 @@ namespace OpenRA.Mods.Cnc.Traits var minefield = GetMinefieldCells(minefieldStart, lastMousePos, minelayers.Max(m => m.Info.TraitInfo().MinefieldDepth)); -#pragma warning disable IDE0019 // Use pattern matching - var movement = minelayer.Trait(); var mobile = movement as Mobile; var pal = wr.Palette(TileSet.TerrainPaletteInternalName); @@ -341,8 +335,6 @@ namespace OpenRA.Mods.Cnc.Traits } yield return new SpriteRenderable(tile, world.Map.CenterOfCell(c), WVec.Zero, -511, pal, 1f, alpha, float3.Ones, TintModifiers.IgnoreWorldTint, true); - -#pragma warning restore IDE0019 // Use pattern matching } }