Added tests to verify tuple expressions as well

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/SpacingRules/SA1008CSharp7UnitTests.cs

@@ -946,5 +946,21 @@ public void TestMethod()
             await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(testCode, fixedCode).ConfigureAwait(false);
         }
+
+        [Fact]
+        [WorkItem(2475, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2475")]
+        public async Task TestSingleLineIfStatementWithTupleExpressionAsync()
+        {
+            var testCode = @"public class TestClass
+{
+    public void TestMethod()
+    {
+        if (true) (1, 2).ToString();
+    }
+}
+";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp7/SpacingRules/SA1009CSharp7UnitTests.cs

@@ -1025,5 +1025,21 @@ public void TestMethod()
             await this.VerifyCSharpDiagnosticAsync(fixedCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
             await this.VerifyCSharpFixAsync(testCode, fixedCode).ConfigureAwait(false);
         }
+
+        [Fact]
+        [WorkItem(2475, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/2475")]
+        public async Task TestSingleLineIfStatementWithTupleExpressionAsync()
+        {
+            var testCode = @"public class TestClass
+{
+    public void TestMethod()
+    {
+        if (true) (1, 2).ToString();
+    }
+}
+";
+
+            await this.VerifyCSharpDiagnosticAsync(testCode, EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test/Helpers/MetadataReferences.cs

@@ -5,6 +5,7 @@ namespace StyleCop.Analyzers.Test.Helpers
 {
     using System;
     using System.Collections.Immutable;
+    using System.IO;
     using System.Linq;
     using System.Reflection;
     using Microsoft.CodeAnalysis;
@@ -15,9 +16,9 @@ namespace StyleCop.Analyzers.Test.Helpers
     /// </summary>
     internal static class MetadataReferences
     {
-        internal static readonly MetadataReference CorlibReference = MetadataReference.CreateFromFile(typeof(object).Assembly.Location).WithAliases(ImmutableArray.Create("global", "corlib"));
-        internal static readonly MetadataReference SystemReference = MetadataReference.CreateFromFile(typeof(System.Diagnostics.Debug).Assembly.Location).WithAliases(ImmutableArray.Create("global", "system"));
-        internal static readonly MetadataReference SystemCoreReference = MetadataReference.CreateFromFile(typeof(Enumerable).Assembly.Location);
+        internal static readonly MetadataReference CorlibReference = CreateDotNetFrameworkMetadataReference("mscorlib").WithAliases(ImmutableArray.Create("global", "corlib"));
+        internal static readonly MetadataReference SystemReference = CreateDotNetFrameworkMetadataReference("System").WithAliases(ImmutableArray.Create("global", "system"));
+        internal static readonly MetadataReference SystemCoreReference = CreateDotNetFrameworkMetadataReference("System.Core");
         internal static readonly MetadataReference CSharpSymbolsReference = MetadataReference.CreateFromFile(typeof(CSharpCompilation).Assembly.Location);
         internal static readonly MetadataReference CodeAnalysisReference = MetadataReference.CreateFromFile(typeof(Compilation).Assembly.Location);
 
@@ -47,5 +48,13 @@ static MetadataReferences()
                 }
             }
         }
+
+        private static MetadataReference CreateDotNetFrameworkMetadataReference(string name)
+        {
+            var referenceAssemblyPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Reference Assemblies", "Microsoft", "Framework", ".NETFramework", "v4.6");
+            var assemblyFilePath = Path.Combine(referenceAssemblyPath, $"{name}.dll");
+
+            return MetadataReference.CreateFromFile(assemblyFilePath);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs

@@ -10,6 +10,7 @@ namespace StyleCop.Analyzers.SpacingRules
     using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Microsoft.CodeAnalysis.Diagnostics;
     using StyleCop.Analyzers.Helpers;
+    using StyleCop.Analyzers.Lightup;
 
     /// <summary>
     /// A closing parenthesis within a C# statement is not spaced correctly.
@@ -90,8 +91,11 @@ private static void HandleCloseParenToken(SyntaxTreeAnalysisContext context, Syn
                 // Allow a space between an open and a close paren when:
                 // - they are part of an if statement
                 // - they are on the same line
-                // - the open paren is part of a parenthesized expression
-                precedesStickyCharacter = !(token.Parent.IsKind(SyntaxKind.IfStatement) && nextToken.Parent.IsKind(SyntaxKind.ParenthesizedExpression) && (token.GetLine() == nextToken.GetLine()));
+                // - the open paren is part of a parenthesized expression or a tuple expression.
+                precedesStickyCharacter =
+                        !(token.Parent.IsKind(SyntaxKind.IfStatement)
+                        && (token.GetLine() == nextToken.GetLine())
+                        && (nextToken.Parent.IsKind(SyntaxKind.ParenthesizedExpression) || nextToken.Parent.IsKind(SyntaxKindEx.TupleExpression)));
                 break;
 
             case SyntaxKind.CloseParenToken: