Code formatting

.editorconfig

@@ -64,6 +64,11 @@ csharp_style_namespace_declarations=file_scoped:warning
 csharp_using_directive_placement = inside_namespace:warning
 dotnet_style_namespace_match_folder=true:warning
 
+# IDE0005: Using directive is unnecessary.
+dotnet_diagnostic.IDE0005.severity = warning
+# IDE0130: Namespace does not match folder structure
+dotnet_diagnostic.IDE0130.severity = warning
+
 # Avoid "this." and "Me." if not necessary
 dotnet_style_qualification_for_field = false:refactoring
 dotnet_style_qualification_for_property = false:refactoring
@@ -319,8 +324,3 @@ dotnet_diagnostic.IDE2004.severity = warning
 # CA1822: Make member static
 # There is a risk of accidentally breaking an internal API that partners rely on though IVT.
 dotnet_code_quality.CA1822.api_surface = private
-
-# IDE0005: Using directive is unnecessary.
-dotnet_diagnostic.IDE0005.severity = warning
-# IDE0130: Namespace does not match folder structure
-dotnet_diagnostic.IDE0130.severity = warning

samples/HackerNewsClient/Shared/HackerNewsApi.cs

@@ -1,6 +1,5 @@
 namespace HackerNewsClient.Shared;
 
-using System.Net;
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Text.Json.Serialization;

samples/HackerNewsClient/Shared/QueryParam.cs

@@ -1,9 +1,8 @@
 namespace HackerNewsClient.Shared;
 
+using System.Globalization;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.WebUtilities;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 
 public sealed class QueryParam
 {

samples/PhetchBlazorDemo/Program.cs

@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Components.Web;
+using Blazored.LocalStorage;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using PhetchBlazorDemo;
 using MudBlazor.Services;
-using Blazored.LocalStorage;
+using PhetchBlazorDemo;
 using PhetchBlazorDemo.Shared;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);

src/Phetch.Blazor/UseEndpoint.razor.cs

@@ -1,8 +1,8 @@
 namespace Phetch.Blazor;
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Components;
 using Phetch.Core;
-using System.Diagnostics.CodeAnalysis;
 
 /// <summary>
 /// A component that can be used to call an endpoint and access the result.

src/Phetch.Core/IsExternalInit.cs

@@ -1,3 +1,5 @@
-namespace System.Runtime.CompilerServices;
+#pragma warning disable IDE0130 // Namespace does not match folder structure
+namespace System.Runtime.CompilerServices;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 internal static class IsExternalInit { }

src/Phetch.Core/RetryHandler.cs

@@ -1,9 +1,9 @@
 namespace Phetch.Core;
 
 using System;
-using System.Threading.Tasks;
-using System.Threading;
 using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+using System.Threading.Tasks;
 
 /// <summary>
 /// An interface to allow queries to be retried when they fail.

test/Phetch.Blazor.Tests/BlazorTestHelpers.cs

@@ -2,27 +2,26 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 internal static class BlazorTestHelpers
 {
     public static (Action<T>, List<T>) MakeMonitoredAction<T>()
     {
         var actionCalls = new List<T>();
-        var action = (T arg) =>
+        void Action(T arg)
         {
             actionCalls.Add(arg);
-        };
-        return (action, actionCalls);
+        }
+        return (Action, actionCalls);
     }
 
     public static (Action, List<object?>) MakeMonitoredAction()
     {
         var actionCalls = new List<object?>();
-        var action = () =>
+        void Action()
         {
             actionCalls.Add(null);
-        };
-        return (action, actionCalls);
+        }
+        return (Action, actionCalls);
     }
 }

test/Phetch.Blazor.Tests/UseParameterlessEndpointTests.razor

@@ -1,5 +1,6 @@
 @using FluentAssertions.Execution;
 @using System.Collections.Specialized;
+@using Phetch.Tests
 @inherits TestContext
 
 @code {

test/Phetch.Tests/MockQueryFunction.cs

@@ -1,9 +1,10 @@
-namespace Phetch.Core;
+namespace Phetch.Tests;
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Phetch.Core;
 
 /// <summary>
 /// Class for creating query functions for testing.

test/Phetch.Tests/OptionsTests.cs

@@ -1,9 +1,9 @@
 namespace Phetch.Tests;
 
+using System;
 using FluentAssertions;
 using FluentAssertions.Execution;
 using Phetch.Core;
-using System;
 using Xunit;
 
 public class OptionsTests

test/Phetch.Tests/TestHelpers.cs

@@ -1,10 +1,9 @@
 namespace Phetch.Tests;
 
-using System.Collections.Generic;
 using System;
-using System.Threading.Tasks;
-using System.Linq;
+using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 using Phetch.Core;
 using Polly;
 
@@ -23,13 +22,13 @@ public static async Task<T> ReturnAsync<T>(T value)
     public static (Func<int, Task<string>> queryFn, IReadOnlyList<int> queryFnCalls) MakeTrackedQueryFn()
     {
         var queryFnCalls = new List<int>();
-        var queryFn = async (int val) =>
+        async Task<string> QueryFn(int val)
         {
             queryFnCalls.Add(val);
             await Task.Yield();
             return val.ToString();
-        };
-        return (queryFn, queryFnCalls);
+        }
+        return (QueryFn, queryFnCalls);
     }
 }