Merge pull request #141 from Yubico/dennisdyallo/implicit-var

Adopt inferred variable types (var) to enhance code readability and maintainability
Yubico · Aug 14, 2024 · e1dbe19 · e1dbe19
2 parents 299b6ae + 6b971e6
commit e1dbe19
Show file tree

Hide file tree

Showing 202 changed files with 1,545 additions and 1,585 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -86,8 +86,8 @@ dotnet_style_readonly_field = true:warning
 #### C# Coding Conventions ####
 
 # var preferences
-csharp_style_var_elsewhere = false:warning
-csharp_style_var_for_built_in_types = false:warning
+csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = false:suggestion
 csharp_style_var_when_type_is_apparent = true:suggestion
 
 # Pattern matching preferences
@@ -351,3 +351,10 @@ dotnet_diagnostic.ca1707.severity = none
 
 # CA1014: Mark assemblies with CLSCompliant
 dotnet_diagnostic.ca1014.severity = none
+
+
+[Yubico.Core/src/**/*.cs]
+# var preferences
+csharp_style_var_elsewhere = false:warning
+csharp_style_var_for_built_in_types = false:warning
+csharp_style_var_when_type_is_apparent = true:warning
diff --git a/Yubico.Core/src/Yubico/Core/Devices/Hid/MacOSHidDevice.cs b/Yubico.Core/src/Yubico/Core/Devices/Hid/MacOSHidDevice.cs
@@ -17,9 +17,8 @@
 using System.Globalization;
 using System.Linq;
 using Microsoft.Extensions.Logging;
-using Yubico.PlatformInterop;
 using Yubico.Core.Logging;
-
+using Yubico.PlatformInterop;
 using static Yubico.PlatformInterop.NativeMethods;
 
 namespace Yubico.Core.Devices.Hid

diff --git a/Yubico.DotNetPolyfills/src/Contrib.Bcl.Ranges/Range.cs b/Yubico.DotNetPolyfills/src/Contrib.Bcl.Ranges/Range.cs
@@ -77,7 +77,7 @@ value is Range r &&
         public (int Offset, int Length) GetOffsetAndLength(int length)
         {
             int start;
-            Index startIndex = Start;
+            var startIndex = Start;
             if (startIndex.IsFromEnd)
             {
                 start = length - startIndex.Value;
@@ -88,7 +88,7 @@ value is Range r &&
             }
 
             int end;
-            Index endIndex = End;
+            var endIndex = End;
             if (endIndex.IsFromEnd)
             {
                 end = length - endIndex.Value;

diff --git a/Yubico.YubiKey/examples/Fido2SampleCode/Run/Fido2SampleGui.cs b/Yubico.YubiKey/examples/Fido2SampleCode/Run/Fido2SampleGui.cs
@@ -231,7 +231,7 @@ public bool LaunchPinPopup(KeyEntryData keyEntryData)
                 return false;
             }
 
-            DialogResult dResult = DialogResult.OK;
+            var dResult = DialogResult.OK;
             do
             {
                 _pinPopupForm.UpdateMessage(dResult, keyEntryData);