Merge pull request #3078 from sharwell/ranges

Fix spacing of closing parenthesis before range operator

Author: vweijsters

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1008CSharp8UnitTests.cs

@@ -8,6 +8,7 @@ namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.CSharp7.SpacingRules;
+    using StyleCop.Analyzers.Test.Verifiers;
     using Xunit;
 
     using static StyleCop.Analyzers.SpacingRules.SA1008OpeningParenthesisMustBeSpacedCorrectly;
@@ -18,25 +19,6 @@ namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
 
     public class SA1008CSharp8UnitTests : SA1008CSharp7UnitTests
     {
-        private const string RangePrologue = @"namespace System
-{
-    public struct Range
-    {
-        public Range(Index a, Index b)
-        {
-        }
-        public Index Start { get; }
-        public Index End { get; }
-    }
-
-    public struct Index
-    {
-        public static implicit operator Index(int value) => throw null;
-        public int GetOffset(int length) => throw null;
-    }
-}
-";
-
         /// <summary>
         /// Verifies that spacing after a range expression double dots isn't required.
         /// </summary>
@@ -46,9 +28,9 @@ public struct Index
         /// </remarks>
         /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
         [Fact]
-        public async Task TestBeforeRangeExpressionAsync()
+        public async Task TestAfterRangeExpressionAsync()
         {
-            var testCode = RangePrologue + @"
+            var testCode = SpecialTypeDefinitions.IndexAndRange + @"
 namespace TestNamespace
 {
     using System;
@@ -64,7 +46,7 @@ public string TestMethod()
 }
 ";
 
-            var fixedCode = RangePrologue + @"
+            var fixedCode = SpecialTypeDefinitions.IndexAndRange + @"
 namespace TestNamespace
 {
     using System;

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/SpacingRules/SA1009CSharp8UnitTests.cs

@@ -7,7 +7,9 @@ namespace StyleCop.Analyzers.Test.CSharp8.SpacingRules
     using System.Threading.Tasks;
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.Testing;
+    using StyleCop.Analyzers.SpacingRules;
     using StyleCop.Analyzers.Test.CSharp7.SpacingRules;
+    using StyleCop.Analyzers.Test.Verifiers;
     using Xunit;
     using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
         StyleCop.Analyzers.SpacingRules.SA1009ClosingParenthesisMustBeSpacedCorrectly,
@@ -96,5 +98,52 @@ public IDisposable Service()
 
             await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, DiagnosticResult.EmptyDiagnosticResults, fixedCode, CancellationToken.None).ConfigureAwait(false);
         }
+
+        /// <summary>
+        /// Verifies that spacing before a range expression double dots isn't required.
+        /// </summary>
+        /// <remarks>
+        /// <para>Double dots of range expressions already provide enough spacing for readability so there is no
+        /// need to suffix the closing parenthesis with a space.</para>
+        /// </remarks>
+        /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
+        [Fact]
+        [WorkItem(3064, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3064")]
+        public async Task TestBeforeRangeExpressionAsync()
+        {
+            var testCode = SpecialTypeDefinitions.IndexAndRange + @"
+namespace TestNamespace
+{
+    using System;
+    public class TestClass
+    {
+        public string TestMethod()
+        {
+            string str = ""test"";
+            int startLen = 4;
+            return str[(startLen - 1) ..];
+        }
+    }
+}
+";
+
+            var fixedCode = SpecialTypeDefinitions.IndexAndRange + @"
+namespace TestNamespace
+{
+    using System;
+    public class TestClass
+    {
+        public string TestMethod()
+        {
+            string str = ""test"";
+            int startLen = 4;
+            return str[(startLen - 1)..];
+        }
+    }
+}
+";
+            DiagnosticResult expected = Diagnostic().WithSpan(28, 37, 28, 38).WithArguments(" not", "followed");
+            await VerifyCSharpFixAsync(LanguageVersion.CSharp8, testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test/Verifiers/SpecialTypeDefinitions.cs

@@ -0,0 +1,27 @@
+// Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+
+namespace StyleCop.Analyzers.Test.Verifiers
+{
+    internal static class SpecialTypeDefinitions
+    {
+        public const string IndexAndRange = @"namespace System
+{
+    public struct Range
+    {
+        public Range(Index a, Index b)
+        {
+        }
+        public Index Start { get; }
+        public Index End { get; }
+    }
+
+    public struct Index
+    {
+        public static implicit operator Index(int value) => throw null;
+        public int GetOffset(int length) => throw null;
+    }
+}
+";
+    }
+}

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

@@ -105,6 +105,7 @@ private static void HandleCloseParenToken(SyntaxTreeAnalysisContext context, Syn
             case SyntaxKind.SemicolonToken:
             case SyntaxKind.CommaToken:
             case SyntaxKind.DoubleQuoteToken:
+            case SyntaxKindEx.DotDotToken:
                 precedesStickyCharacter = true;
                 break;