Fix some warnings

blowfishpro · blowfishpro · commit f267e520c851 · 2021-03-17T20:42:14.000-07:00
Use new C# features
diff --git a/B9PartSwitch/Extensions/PartExtensions.cs b/B9PartSwitch/Extensions/PartExtensions.cs
@@ -24,8 +24,10 @@ public static PartResource AddResource(this Part part, PartResourceDefinition in
             resource.flowMode = PartResource.FlowMode.Both;
             part.Resources.dict.Add(info.name.GetHashCode(), resource);
 
-            PartResource simulationResource = new PartResource(resource);
-            simulationResource.simulationResource = true;
+            PartResource simulationResource = new PartResource(resource)
+            {
+                simulationResource = true
+            };
             part.SimulationResources.dict.Add(info.name.GetHashCode(), simulationResource);
 
             GameEvents.onPartResourceListChange.Fire(part);
diff --git a/B9PartSwitch/ModuleMatcher.cs b/B9PartSwitch/ModuleMatcher.cs
@@ -64,8 +64,8 @@ public PartModule FindModule(Part part)
 
         public ConfigNode FindPrefabNode(PartModule module)
         {
-            if (!(module.part.partInfo is AvailablePart partInfo)) throw new InvalidOperationException($"partInfo is null on part {module.part.name}");
-            if (!(partInfo.partConfig is ConfigNode partConfig)) throw new InvalidOperationException($"partInfo.partConfig is null on part {partInfo.name}");
+            if (module.part.partInfo is not AvailablePart partInfo) throw new InvalidOperationException($"partInfo is null on part {module.part.name}");
+            if (partInfo.partConfig is not ConfigNode partConfig) throw new InvalidOperationException($"partInfo.partConfig is null on part {partInfo.name}");
 
             ConfigNode matchedNode = null;
 
@@ -142,7 +142,7 @@ private bool NodeMatchesModule(PartModule module, ConfigNode node)
             {
                 if (value.name == "name") continue;
 
-                if (!(node.GetValue(value.name) is string testValue)) return false;
+                if (node.GetValue(value.name) is not string testValue) return false;
 
                 if (module.Fields[value.name] is BaseField baseField)
                 {
diff --git a/B9PartSwitch/PartSwitch/ModuleB9PartSwitch.cs b/B9PartSwitch/PartSwitch/ModuleB9PartSwitch.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using UniLinq;
 using UnityEngine;
 using B9PartSwitch.Fishbones;
@@ -98,7 +97,6 @@ private set
         #region Private Fields
 
         // Tweakscale integration (set via reflection, readonly is ok)
-        [SuppressMessage("Style", "IDE0032", Justification = "Set by Tweakscale")]
         private readonly float scale = 1f;
 
         private readonly List<ModuleB9PartSwitch> children = new List<ModuleB9PartSwitch>(0);
diff --git a/B9PartSwitch/PartSwitch/ModuleModifierInfo.cs b/B9PartSwitch/PartSwitch/ModuleModifierInfo.cs
@@ -98,8 +98,8 @@ public IEnumerable<IPartModifier> CreatePartModifiers(Part part, PartModule pare
 
             if (dataNode.IsNotNull())
             {
-                if (!(module.part.partInfo is AvailablePart partInfo)) throw new InvalidOperationException($"partInfo is null on part {part.name}");
-                if (!(partInfo.partConfig is ConfigNode partConfig)) throw new InvalidOperationException($"partInfo.partConfig is null on part {partInfo.name}");
+                if (module.part.partInfo is not AvailablePart partInfo) throw new InvalidOperationException($"partInfo is null on part {part.name}");
+                if (partInfo.partConfig is not ConfigNode partConfig) throw new InvalidOperationException($"partInfo.partConfig is null on part {partInfo.name}");
 
                 ConfigNode originalNode = moduleMatcher.FindPrefabNode(module);
 
diff --git a/B9PartSwitch/PartSwitch/PartModifiers/ModuleDeactivator.cs b/B9PartSwitch/PartSwitch/PartModifiers/ModuleDeactivator.cs
@@ -16,7 +16,7 @@ public ModuleDeactivator(PartModule module, PartModule parent)
             this.parent = parent;
         }
 
-        public override string Description => $"module {module.ToString()} activated status";
+        public override string Description => $"module {module} activated status";
 
         public override void ActivateOnStartEditor() => Activate();
         public override void ActivateOnStartFlight() => Activate();
@@ -38,7 +38,7 @@ protected virtual void MaybeDeactivate()
             foreach (PartModule otherModule in module.part.Modules)
             {
                 if (otherModule == parent) continue;
-                if (!(otherModule is ModuleB9PartSwitch switchModule)) continue;
+                if (otherModule is not ModuleB9PartSwitch switchModule) continue;
                 if (switchModule.ModuleShouldBeEnabled(module)) return;
             }
 
diff --git a/B9PartSwitch/PartSwitch/PartSubtype.cs b/B9PartSwitch/PartSwitch/PartSubtype.cs
@@ -560,7 +560,7 @@ public bool ModuleShouldBeEnabled(PartModule module)
         {
             foreach (IPartModifier partModifier in partModifiers)
             {
-                if (!(partModifier is ModuleDeactivator moduleDeactivator)) continue;
+                if (partModifier is not ModuleDeactivator moduleDeactivator) continue;
                 if (moduleDeactivator.module == module) return false;
             }
 
diff --git a/B9PartSwitch/Utils/ColorParser.cs b/B9PartSwitch/Utils/ColorParser.cs
@@ -126,49 +126,26 @@ public static Color Parse(string colorStr)
 
         private static byte ParseHex(char value)
         {
-            switch (value)
+            return value switch
             {
-                case '0':
-                    return 0;
-                case '1':
-                    return 1;
-                case '2':
-                    return 2;
-                case '3':
-                    return 3;
-                case '4':
-                    return 4;
-                case '5':
-                    return 5;
-                case '6':
-                    return 6;
-                case '7':
-                    return 7;
-                case '8':
-                    return 8;
-                case '9':
-                    return 9;
-                case 'A':
-                case 'a':
-                    return 10;
-                case 'B':
-                case 'b':
-                    return 11;
-                case 'C':
-                case 'c':
-                    return 12;
-                case 'D':
-                case 'd':
-                    return 13;
-                case 'E':
-                case 'e':
-                    return 14;
-                case 'F':
-                case 'f':
-                    return 15;
-                default:
-                    throw new FormatException("Invalid hexadecimal character: " + value);
-            }
+                '0' => 0,
+                '1' => 1,
+                '2' => 2,
+                '3' => 3,
+                '4' => 4,
+                '5' => 5,
+                '6' => 6,
+                '7' => 7,
+                '8' => 8,
+                '9' => 9,
+                'A' or 'a' => 10,
+                'B' or 'b' => 11,
+                'C' or 'c' => 12,
+                'D' or 'd' => 13,
+                'E' or 'e' => 14,
+                'F' or 'f' => 15,
+                _ => throw new FormatException("Invalid hexadecimal character: " + value),
+            };
         }
 
         private static float ParseFloatValue(string valueStr)
diff --git a/B9PartSwitchTests/Fishbones/NodeDataListBuilderTest.cs b/B9PartSwitchTests/Fishbones/NodeDataListBuilderTest.cs
@@ -26,12 +26,12 @@ private class NodeDataClass
 #pragma warning restore CS0649
 
             [NodeData]
-            public DummyClass x { get; protected set; }
+            public DummyClass X { get; protected set; }
 
             [NodeData]
-            public DummyClass y { get { throw new NotImplementedException(); } set { } }
+            public DummyClass Y { get { throw new NotImplementedException(); } set { } }
 
-            public DummyClass z { get; set; }
+            public DummyClass Z { get; set; }
         }
 
         #region Constructor
@@ -56,9 +56,9 @@ public void TestCreateList()
             FieldInfo iField = typeof(NodeDataClass).GetField("i", flags);
             FieldInfo jField = typeof(NodeDataClass).GetField("j", flags);
             FieldInfo kField = typeof(NodeDataClass).GetField("k", flags);
-            PropertyInfo xProperty = typeof(NodeDataClass).GetProperty("x", flags);
-            PropertyInfo yProperty = typeof(NodeDataClass).GetProperty("y", flags);
-            PropertyInfo zProperty = typeof(NodeDataClass).GetProperty("z", flags);
+            PropertyInfo xProperty = typeof(NodeDataClass).GetProperty("X", flags);
+            PropertyInfo yProperty = typeof(NodeDataClass).GetProperty("Y", flags);
+            PropertyInfo zProperty = typeof(NodeDataClass).GetProperty("Z", flags);
 
             Assert.NotNull(iField);
             Assert.NotNull(jField);
diff --git a/B9PartSwitchTests/Fishbones/Parsers/NodeObjectWrapperIContextualNodeTest.cs b/B9PartSwitchTests/Fishbones/Parsers/NodeObjectWrapperIContextualNodeTest.cs
@@ -117,6 +117,8 @@ public void TestSave()
             };
 
             ConfigNode node = wrapper.Save(obj, Exemplars.SaveContext);
+
+            Assert.Equal("stuff", node.GetValue("value"));
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ public PartModule FindModule(Part part)`
`64`	`64`
`65`	`65`	`public ConfigNode FindPrefabNode(PartModule module)`
`66`	`66`	`{`
`67`		`- if (!(module.part.partInfo is AvailablePart partInfo)) throw new InvalidOperationException($"partInfo is null on part {module.part.name}");`
`68`		`- if (!(partInfo.partConfig is ConfigNode partConfig)) throw new InvalidOperationException($"partInfo.partConfig is null on part {partInfo.name}");`
	`67`	`+ if (module.part.partInfo is not AvailablePart partInfo) throw new InvalidOperationException($"partInfo is null on part {module.part.name}");`
	`68`	`+ if (partInfo.partConfig is not ConfigNode partConfig) throw new InvalidOperationException($"partInfo.partConfig is null on part {partInfo.name}");`
`69`	`69`
`70`	`70`	`ConfigNode matchedNode = null;`
`71`	`71`
`@@ -142,7 +142,7 @@ private bool NodeMatchesModule(PartModule module, ConfigNode node)`
`142`	`142`	`{`
`143`	`143`	`if (value.name == "name") continue;`
`144`	`144`
`145`		`- if (!(node.GetValue(value.name) is string testValue)) return false;`
	`145`	`+ if (node.GetValue(value.name) is not string testValue) return false;`
`146`	`146`
`147`	`147`	`if (module.Fields[value.name] is BaseField baseField)`
`148`	`148`	`{`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,8 @@ public IEnumerable<IPartModifier> CreatePartModifiers(Part part, PartModule pare`
`98`	`98`
`99`	`99`	`if (dataNode.IsNotNull())`
`100`	`100`	`{`
`101`		`- if (!(module.part.partInfo is AvailablePart partInfo)) throw new InvalidOperationException($"partInfo is null on part {part.name}");`
`102`		`- if (!(partInfo.partConfig is ConfigNode partConfig)) throw new InvalidOperationException($"partInfo.partConfig is null on part {partInfo.name}");`
	`101`	`+ if (module.part.partInfo is not AvailablePart partInfo) throw new InvalidOperationException($"partInfo is null on part {part.name}");`
	`102`	`+ if (partInfo.partConfig is not ConfigNode partConfig) throw new InvalidOperationException($"partInfo.partConfig is null on part {partInfo.name}");`
`103`	`103`
`104`	`104`	`ConfigNode originalNode = moduleMatcher.FindPrefabNode(module);`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public ModuleDeactivator(PartModule module, PartModule parent)`
`16`	`16`	`this.parent = parent;`
`17`	`17`	`}`
`18`	`18`
`19`		`- public override string Description => $"module {module.ToString()} activated status";`
	`19`	`+ public override string Description => $"module {module} activated status";`
`20`	`20`
`21`	`21`	`public override void ActivateOnStartEditor() => Activate();`
`22`	`22`	`public override void ActivateOnStartFlight() => Activate();`
`@@ -38,7 +38,7 @@ protected virtual void MaybeDeactivate()`
`38`	`38`	`foreach (PartModule otherModule in module.part.Modules)`
`39`	`39`	`{`
`40`	`40`	`if (otherModule == parent) continue;`
`41`		`- if (!(otherModule is ModuleB9PartSwitch switchModule)) continue;`
	`41`	`+ if (otherModule is not ModuleB9PartSwitch switchModule) continue;`
`42`	`42`	`if (switchModule.ModuleShouldBeEnabled(module)) return;`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ public bool ModuleShouldBeEnabled(PartModule module)`
`560`	`560`	`{`
`561`	`561`	`foreach (IPartModifier partModifier in partModifiers)`
`562`	`562`	`{`
`563`		`- if (!(partModifier is ModuleDeactivator moduleDeactivator)) continue;`
	`563`	`+ if (partModifier is not ModuleDeactivator moduleDeactivator) continue;`
`564`	`564`	`if (moduleDeactivator.module == module) return false;`
`565`	`565`	`}`
`566`	`566`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,8 @@ public void TestSave()`
`117`	`117`	`};`
`118`	`118`
`119`	`119`	`ConfigNode node = wrapper.Save(obj, Exemplars.SaveContext);`
	`120`	`+`
	`121`	`+ Assert.Equal("stuff", node.GetValue("value"));`
`120`	`122`	`}`
`121`	`123`
`122`	`124`	`[Fact]`