#177: xUnit1030 should not trigger inside lambda

xunit · Jan 2, 2024 · ee7e5d9 · ee7e5d9
1 parent 397e6d5
commit ee7e5d9
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 22 deletions.
diff --git a/src/xunit.analyzers.tests/Analyzers/X1000/DoNotUseConfigureAwaitTests.cs b/src/xunit.analyzers.tests/Analyzers/X1000/DoNotUseConfigureAwaitTests.cs
@@ -63,6 +63,28 @@ public async Task TestMethod() {
 			"booleanVar",  // Reference value (we don't do lookup)
 		};
 
+		[Theory]
+		[MemberData(nameof(InvalidValues))]
+		public async void InvalidValue_InsideLambda_DoesNotTrigger(string argumentValue)
+		{
+			var source = @$"
+using System.Threading.Tasks;
+using Xunit;
+
+public class TestClass {{
+    [Fact]
+    public async Task TestMethod() {{
+        var booleanVar = true;
+        var t = Task.Run(async () => {{
+            await Task.Delay(1).ConfigureAwait({argumentValue});
+        }});
+        await t;
+    }}
+}}";
+
+			await Verify.VerifyAnalyzer(source);
+		}
+
 		[Theory]
 		[MemberData(nameof(InvalidValues))]
 		public async void InvalidValue_TaskWithAwait_Triggers(string argumentValue)
@@ -185,27 +207,6 @@ public async Task TestMethod() {{
 
 			await Verify.VerifyAnalyzer(source, expected);
 		}
-
-		[Fact]
-		public async void False_DoesNotTriggerInNestedTask()
-		{
-			var source = @"
-using System.Threading.Tasks;
-using Xunit;
-
-public class TestClass {
-    [Fact]
-    public async Task TestMethod() {
-		var t = Task.Run(async () => {
-			await Task.Delay(1).ConfigureAwait(false);
-		});
-		
-		await t;
-    }
-}";
-
-			await Verify.VerifyAnalyzer(source);
-		}
 	}
 
 #if NETCOREAPP
@@ -260,7 +261,29 @@ public async Task TestMethod() {{
 
 		[Theory]
 		[MemberData(nameof(InvalidValues))]
-		public async void InvalidValue_TaskWithAwait_DoesNotTrigger(string enumValue)
+		public async void InvalidValue_InsideLambda_DoesNotTrigger(string argumentValue)
+		{
+			var source = @$"
+using System.Threading.Tasks;
+using Xunit;
+
+public class TestClass {{
+    [Fact]
+    public async Task TestMethod() {{
+        var enumVar = ConfigureAwaitOptions.ContinueOnCapturedContext;
+        var t = Task.Run(async () => {{
+            await Task.Delay(1).ConfigureAwait({argumentValue});
+        }});
+        await t;
+    }}
+}}";
+
+			await Verify.VerifyAnalyzer(source);
+		}
+
+		[Theory]
+		[MemberData(nameof(InvalidValues))]
+		public async void InvalidValue_TaskWithAwait_Triggers(string enumValue)
 		{
 			var source = $@"
 using System.Threading.Tasks;

diff --git a/src/xunit.analyzers/X1000/DoNotUseConfigureAwait.cs b/src/xunit.analyzers/X1000/DoNotUseConfigureAwait.cs
@@ -63,6 +63,11 @@ public override void AnalyzeCompilation(
 			if (!invocation.IsInTestMethod(xunitContext))
 				return;
 
+			// Ignore anything inside a lambda expression
+			for (var current = context.Operation; current is not null; current = current.Parent)
+				if (current is IAnonymousFunctionOperation)
+					return;
+
 			// invocation should be two nodes: "(some other code).ConfigureAwait" and the arguments (like "(false)")
 			var invocationChildren = invocation.Syntax.ChildNodes().ToList();
 			if (invocationChildren.Count != 2)