Fix styling warnings

IrishBruse · May 28, 2024 · d156679 · d156679
1 parent c1fdf81
commit d156679
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 18 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -28,6 +28,8 @@ dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
 dotnet_style_explicit_tuple_names = true:suggestion
 
+dotnet_style_prefer_collection_expression = false
+
 # CSharp code style settings:
 
 # IDE0040: Add accessibility modifiers

diff --git a/LDtk.Codegen/Generators/ClassGenerator.cs b/LDtk.Codegen/Generators/ClassGenerator.cs
@@ -2,10 +2,8 @@ namespace LDtk.Codegen.Generators;
 
 using LDtk.Codegen;
 
-public class ClassGenerator : BaseGenerator
+public class ClassGenerator(LDtkFile ldtkFile, Options options) : BaseGenerator(ldtkFile, options)
 {
-    public ClassGenerator(LDtkFile ldtkFile, Options options) : base(ldtkFile, options) { }
-
     public void Generate()
     {
         // Level Classes

diff --git a/LDtk.Codegen/Generators/EnumGenerator.cs b/LDtk.Codegen/Generators/EnumGenerator.cs
@@ -1,9 +1,7 @@
 namespace LDtk.Codegen.Generators;
 
-public class EnumGenerator : BaseGenerator
+public class EnumGenerator(LDtkFile ldtkFile, Options options) : BaseGenerator(ldtkFile, options)
 {
-    public EnumGenerator(LDtkFile ldtkFile, Options options) : base(ldtkFile, options) { }
-
     public void Generate()
     {
         foreach (EnumDefinition e in LDtkFile.Defs.Enums)

diff --git a/LDtk.Codegen/Generators/IidGenerator.cs b/LDtk.Codegen/Generators/IidGenerator.cs
@@ -1,9 +1,7 @@
 namespace LDtk.Codegen.Generators;
 
-public class IidGenerator : BaseGenerator
+public class IidGenerator(LDtkFile ldtkFile, Options options) : BaseGenerator(ldtkFile, options)
 {
-    public IidGenerator(LDtkFile ldtkFile, Options options) : base(ldtkFile, options) { }
-
     public void Generate()
     {
         Line($"namespace {Options.Namespace};");

diff --git a/LDtk.Example/LDtkTypes/World/CustomLevelDataName.cs b/LDtk.Example/LDtkTypes/World/CustomLevelDataName.cs
@@ -4,6 +4,7 @@ namespace LDtkTypes;
 #pragma warning disable
 
 using LDtk;
+
 using Microsoft.Xna.Framework;
 
 public partial class CustomLevelDataName

diff --git a/LDtk.Example/LDtkTypes/World/Entities/Enemy.cs b/LDtk.Example/LDtkTypes/World/Entities/Enemy.cs
@@ -4,6 +4,7 @@ namespace LDtkTypes;
 #pragma warning disable
 
 using LDtk;
+
 using Microsoft.Xna.Framework;
 
 public partial class Enemy : ILDtkEntity

diff --git a/LDtk.Example/LDtkTypes/World/Entities/Gun_Pickup.cs b/LDtk.Example/LDtkTypes/World/Entities/Gun_Pickup.cs
@@ -4,6 +4,7 @@ namespace LDtkTypes;
 #pragma warning disable
 
 using LDtk;
+
 using Microsoft.Xna.Framework;
 
 public partial class Gun_Pickup : ILDtkEntity

diff --git a/LDtk.Example/LDtkTypes/World/Entities/Player.cs b/LDtk.Example/LDtkTypes/World/Entities/Player.cs
@@ -4,6 +4,7 @@ namespace LDtkTypes;
 #pragma warning disable
 
 using LDtk;
+
 using Microsoft.Xna.Framework;
 
 public partial class Player : ILDtkEntity

diff --git a/LDtk.Example/LDtkTypes/World/Entities/RefTest.cs b/LDtk.Example/LDtkTypes/World/Entities/RefTest.cs
@@ -4,6 +4,7 @@ namespace LDtkTypes;
 #pragma warning disable
 
 using LDtk;
+
 using Microsoft.Xna.Framework;
 
 public partial class RefTest : ILDtkEntity

diff --git a/LDtk.Example/LDtkTypes/World/LDtkLevelData.cs b/LDtk.Example/LDtkTypes/World/LDtkLevelData.cs
@@ -4,6 +4,7 @@ namespace LDtkTypes;
 #pragma warning disable
 
 using LDtk;
+
 using Microsoft.Xna.Framework;
 
 public partial class LDtkLevelData

diff --git a/LDtk.Tests/IntGridTests.cs b/LDtk.Tests/IntGridTests.cs
@@ -14,14 +14,14 @@ public class IntGridTests
     [InlineData(15.00f, 15.00f, 1, 1)]
     public void FromWorldToGridSpaceVector2(float worldX, float worldY, int expectedGridSpaceX = 0, int expectedGridSpaceY = 0)
     {
-        var intGrid = new LDtkIntGrid()
+        LDtkIntGrid intGrid = new()
         {
             WorldPosition = new Point(-1, -1),
             TileSize = 16
         };
 
-        Vector2 positionInWorld = new Vector2(worldX, worldY);
-        Point expectedPositionInGridSpace = new Point(expectedGridSpaceX, expectedGridSpaceY);
+        Vector2 positionInWorld = new(worldX, worldY);
+        Point expectedPositionInGridSpace = new(expectedGridSpaceX, expectedGridSpaceY);
         Assert.Equal(intGrid.FromWorldToGridSpace(positionInWorld), expectedPositionInGridSpace);
     }
 
@@ -33,14 +33,14 @@ public void FromWorldToGridSpaceVector2(float worldX, float worldY, int expected
     [InlineData(15, 15, 1, 1)]
     public void FromWorldToGridSpacePoint(int worldX, int worldY, int expectedGridSpaceX = 0, int expectedGridSpaceY = 0)
     {
-        var intGrid = new LDtkIntGrid()
+        LDtkIntGrid intGrid = new()
         {
             WorldPosition = new Point(-1, -1),
             TileSize = 16
         };
 
-        Point positionInWorld = new Point(worldX, worldY);
-        Point expectedPositionInGridSpace = new Point(expectedGridSpaceX, expectedGridSpaceY);
+        Point positionInWorld = new(worldX, worldY);
+        Point expectedPositionInGridSpace = new(expectedGridSpaceX, expectedGridSpaceY);
         Assert.Equal(intGrid.FromWorldToGridSpace(positionInWorld), expectedPositionInGridSpace);
     }
 
@@ -51,7 +51,7 @@ public void FromWorldToGridSpacePoint(int worldX, int worldY, int expectedGridSp
     [InlineData(-1, -1, false)]
     public void ContainsPoint(int x, int y, bool isPointInGrid)
     {
-        var intGrid = new LDtkIntGrid()
+        LDtkIntGrid intGrid = new()
         {
             GridSize = new Point(2, 2)
         };
@@ -66,7 +66,7 @@ public void ContainsPoint(int x, int y, bool isPointInGrid)
     [InlineData(-.01f, -.01f, false)]
     public void ContainsVector2(float x, float y, bool isPointInGrid)
     {
-        var intGrid = new LDtkIntGrid()
+        LDtkIntGrid intGrid = new()
         {
             GridSize = new Point(2, 2)
         };

diff --git a/LDtk/JsonPartials/LDtkFile.cs b/LDtk/JsonPartials/LDtkFile.cs
@@ -25,7 +25,7 @@ public LDtkFile() { }
 
     /// <summary> An array containing various advanced flags (ie. options or other states). </summary>
     [JsonPropertyName("flags")]
-    public string[] Flags { get; set; }
+    public string[]? Flags { get; set; }
 
     /// <summary> Loads the ldtk world file from disk directly using json source generator. </summary>
     /// <param name="filePath"> Path to the .ldtk file. </param>
@@ -77,6 +77,11 @@ static void ValidateFile(LDtkFile file)
             throw new LDtkException("LDtk file version is not supported. Please update your LDtk version.");
         }
 
+        if (file.Flags == null)
+        {
+            throw new LDtkException("LDtk file is missing required flags. Please enable them in the ldtk file flags in the UI.");
+        }
+
         if (!file.Flags.Contains("MultiWorlds"))
         {
             throw new LDtkException("LDtk file is not a multiworld file. Please enable MultiWorlds in the ldtk file flags.");