Merge pull request #5062 from Youssef1313/dead-condition

Remove dead condition
dotnet · May 4, 2021 · 7639d20 · 7639d20
2 parents a91b132 + 4b13390
commit 7639d20
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/...nalyzers/Core/Microsoft.CodeQuality.Analyzers/Maintainability/UseNameofInPlaceOfString.cs b/...nalyzers/Core/Microsoft.CodeQuality.Analyzers/Maintainability/UseNameofInPlaceOfString.cs
@@ -60,16 +60,11 @@ private void AnalyzeArgument(OperationAnalysisContext context)
                 return;
             }
 
-            if (argument.Parameter == null)
-            {
-                return;
-            }
-
             var stringText = (string)argument.Value.ConstantValue.Value;
 
-            var matchingParameter = argument.Parameter;
-
-            switch (matchingParameter.Name)
+            // argument.Parameter will not be null here. The only case for it to be null is an __arglist argument, for which
+            // the argument type will not be of SpecialType.System_String.
+            switch (argument.Parameter.Name)
             {
                 case ParamName:
                     var parametersInScope = GetParametersInScope(context);

diff --git a/...nitTests/Microsoft.CodeQuality.Analyzers/Maintainability/UseNameOfInPlaceOfStringTests.cs b/...nitTests/Microsoft.CodeQuality.Analyzers/Maintainability/UseNameOfInPlaceOfStringTests.cs
@@ -17,6 +17,20 @@ public class UseNameofInPlaceOfStringTests
     {
         #region Unit tests for no analyzer diagnostic
 
+        [Fact]
+        [WorkItem(3023, "https://github.com/dotnet/roslyn-analyzers/issues/3023")]
+        public async Task NoDiagnostic_ArgList()
+        {
+            await VerifyCS.VerifyAnalyzerAsync(@"
+public class C
+{
+    public void M(__arglist)
+    {
+        M(__arglist());
+    }
+}");
+        }
+
         [Fact]
         public async Task NoDiagnostic_NoArguments()
         {