Naming and sort order

xunit · May 21, 2024 · 2100542 · 2100542
1 parent 3fdb56a
commit 2100542
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/src/xunit.analyzers/Utility/TypeSymbolFactory.cs b/src/xunit.analyzers/Utility/TypeSymbolFactory.cs
@@ -68,27 +68,27 @@ public static class TypeSymbolFactory
 	public static INamedTypeSymbol? IAssemblyInfo_V2(Compilation compilation) =>
 		Guard.ArgumentNotNull(compilation).GetTypeByMetadataName("Xunit.Abstractions.IAssemblyInfo");
 
-	public static INamedTypeSymbol? IAsyncEnumerableOfObjectArray(Compilation compilation)
+	public static INamedTypeSymbol? IAsyncEnumerableOfITheoryDataRow(Compilation compilation)
 	{
 		var iAsyncEnumerableOfT = IAsyncEnumerableOfT(compilation);
 		if (iAsyncEnumerableOfT is null)
 			return null;
 
-		var objectArray = ObjectArray(compilation);
-		return iAsyncEnumerableOfT.Construct(objectArray);
+		var iTheoryDataRow = ITheoryDataRow(compilation);
+		if (iTheoryDataRow is null)
+			return null;
+
+		return iAsyncEnumerableOfT.Construct(iTheoryDataRow);
 	}
 
-	public static INamedTypeSymbol? IAsyncEnumerableOfTheoryDataRow(Compilation compilation)
+	public static INamedTypeSymbol? IAsyncEnumerableOfObjectArray(Compilation compilation)
 	{
 		var iAsyncEnumerableOfT = IAsyncEnumerableOfT(compilation);
 		if (iAsyncEnumerableOfT is null)
 			return null;
 
-		var iTheoryDataRow = ITheoryDataRow(compilation);
-		if (iTheoryDataRow is null)
-			return null;
-
-		return iAsyncEnumerableOfT.Construct(iTheoryDataRow);
+		var objectArray = ObjectArray(compilation);
+		return iAsyncEnumerableOfT.Construct(objectArray);
 	}
 
 	public static INamedTypeSymbol? IAsyncEnumerableOfT(Compilation compilation) =>
@@ -118,15 +118,6 @@ public static INamedTypeSymbol ICollectionOfT(Compilation compilation) =>
 	public static INamedTypeSymbol IDisposable(Compilation compilation) =>
 		Guard.ArgumentNotNull(compilation).GetSpecialType(SpecialType.System_IDisposable);
 
-	public static INamedTypeSymbol IEnumerableOfObjectArray(Compilation compilation)
-	{
-		var iEnumerableOfT = Guard.ArgumentNotNull(compilation).GetSpecialType(SpecialType.System_Collections_Generic_IEnumerable_T);
-		var objectArray = ObjectArray(compilation);
-		var iEnumerableOfObjectArray = iEnumerableOfT.Construct(objectArray);
-
-		return iEnumerableOfObjectArray;
-	}
-
 	public static INamedTypeSymbol? IEnumerableOfITheoryDataRow(Compilation compilation)
 	{
 		var iTheoryDataRow = ITheoryDataRow(compilation);
@@ -137,6 +128,15 @@ public static INamedTypeSymbol IEnumerableOfObjectArray(Compilation compilation)
 		return iEnumerableOfT.Construct(iTheoryDataRow);
 	}
 
+	public static INamedTypeSymbol IEnumerableOfObjectArray(Compilation compilation)
+	{
+		var iEnumerableOfT = Guard.ArgumentNotNull(compilation).GetSpecialType(SpecialType.System_Collections_Generic_IEnumerable_T);
+		var objectArray = ObjectArray(compilation);
+		var iEnumerableOfObjectArray = iEnumerableOfT.Construct(objectArray);
+
+		return iEnumerableOfObjectArray;
+	}
+
 	public static INamedTypeSymbol? IMessageSink_V2(Compilation compilation) =>
 		Guard.ArgumentNotNull(compilation).GetTypeByMetadataName("Xunit.Abstractions.IMessageSink");
 

diff --git a/src/xunit.analyzers/X1000/MemberDataShouldReferenceValidMember.cs b/src/xunit.analyzers/X1000/MemberDataShouldReferenceValidMember.cs
@@ -155,7 +155,7 @@ memberReturnType is INamedTypeSymbol namedMemberReturnType &&
 
 				// Make sure the member returns a compatible type
 				var iEnumerableOfTheoryDataRowType = TypeSymbolFactory.IEnumerableOfITheoryDataRow(compilation);
-				var iAsyncEnumerableOfTheoryDataRowType = TypeSymbolFactory.IAsyncEnumerableOfTheoryDataRow(compilation);
+				var iAsyncEnumerableOfTheoryDataRowType = TypeSymbolFactory.IAsyncEnumerableOfITheoryDataRow(compilation);
 				var IsValidMemberReturnType =
 					VerifyDataSourceReturnType(context, compilation, xunitContext, memberReturnType, memberProperties, attributeSyntax, iEnumerableOfTheoryDataRowType, iAsyncEnumerableOfTheoryDataRowType);