Merge pull request #15240 from CyrusNajmabadi/splitStrings

Typing <enter> after an interpolated string should not cause 'split string' to invoke.

src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.InterpolatedStringSplitter.cs

@@ -25,16 +25,9 @@ private class InterpolatedStringSplitter : StringSplitter
 
             protected override SyntaxNode GetNodeToReplace() => _interpolatedStringExpression;
 
+            // Don't offer on $@"" strings.  They support newlines directly in their content.
             protected override bool CheckToken()
-            {
-                if (_interpolatedStringExpression.StringStartToken.Kind() == SyntaxKind.InterpolatedVerbatimStringStartToken)
-                {
-                    // Don't offer on $@"" strings.  They support newlines directly in their content.
-                    return false;
-                }
-
-                return true;
-            }
+                => _interpolatedStringExpression.StringStartToken.Kind() != SyntaxKind.InterpolatedVerbatimStringStartToken;
 
             protected override BinaryExpressionSyntax CreateSplitString()
             {

src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.SimpleStringSplitter.cs

@@ -18,21 +18,9 @@ public SimpleStringSplitter(Document document, int position, SyntaxNode root, So
                 _token = token;
             }
 
+            // Don't split @"" strings.  They already support directly embedding newlines.
             protected override bool CheckToken()
-            {
-                if (CursorPosition <= _token.SpanStart || CursorPosition >= _token.Span.End)
-                {
-                    return false;
-                }
-
-                if (_token.IsVerbatimStringLiteral())
-                {
-                    // Don't split @"" strings.  They already support directly embedding newlines.
-                    return false;
-                }
-
-                return true;
-            }
+                => !_token.IsVerbatimStringLiteral();
 
             protected override SyntaxNode GetNodeToReplace() => _token.Parent;
 

src/EditorFeatures/CSharp/SplitStringLiteral/SplitStringLiteralCommandHandler.StringSplitter.cs

@@ -91,6 +91,13 @@ private static bool IsInterpolationOpenBrace(SyntaxToken token, int position)
 
             public int? TrySplit()
             {
+                var nodeToReplace = GetNodeToReplace();
+
+                if (CursorPosition <= nodeToReplace.SpanStart || CursorPosition >= nodeToReplace.Span.End)
+                {
+                    return null;
+                }
+
                 if (!CheckToken())
                 {
                     return null;

src/EditorFeatures/CSharpTest/SplitStringLiteral/SplitStringLiteralCommandHandlerTests.cs

@@ -91,7 +91,7 @@ void M()
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.SplitStringLiteral)]
-        public async Task TestMissingAfterString()
+        public async Task TestMissingAfterString_1()
         {
             await TestNotHandledAsync(
 @"class C
@@ -104,7 +104,46 @@ void M()
         }
 
         [WpfFact, Trait(Traits.Feature, Traits.Features.SplitStringLiteral)]
-        public async Task TestMissingAfterInterpolatedString()
+        public async Task TestMissingAfterString_2()
+        {
+            await TestNotHandledAsync(
+@"class C
+{
+    void M()
+    {
+        var v = """" [||];
+    }
+}");
+        }
+
+        [WpfFact, Trait(Traits.Feature, Traits.Features.SplitStringLiteral)]
+        public async Task TestMissingAfterString_3()
+        {
+            await TestNotHandledAsync(
+@"class C
+{
+    void M()
+    {
+        var v = """"[||]
+    }
+}");
+        }
+
+        [WpfFact, Trait(Traits.Feature, Traits.Features.SplitStringLiteral)]
+        public async Task TestMissingAfterString_4()
+        {
+            await TestNotHandledAsync(
+@"class C
+{
+    void M()
+    {
+        var v = """" [||]
+    }
+}");
+        }
+
+        [WpfFact, Trait(Traits.Feature, Traits.Features.SplitStringLiteral)]
+        public async Task TestMissingAfterInterpolatedString_1()
         {
             await TestNotHandledAsync(
 @"class C
@@ -116,6 +155,45 @@ void M()
 }");
         }
 
+        [WpfFact, Trait(Traits.Feature, Traits.Features.SplitStringLiteral)]
+        public async Task TestMissingAfterInterpolatedString_2()
+        {
+            await TestNotHandledAsync(
+@"class C
+{
+    void M()
+    {
+        var v = $"""" [||];
+    }
+}");
+        }
+
+        [WpfFact, Trait(Traits.Feature, Traits.Features.SplitStringLiteral)]
+        public async Task TestMissingAfterInterpolatedString_3()
+        {
+            await TestNotHandledAsync(
+@"class C
+{
+    void M()
+    {
+        var v = $""""[||]
+    }
+}");
+        }
+
+        [WpfFact, Trait(Traits.Feature, Traits.Features.SplitStringLiteral)]
+        public async Task TestMissingAfterInterpolatedString_4()
+        {
+            await TestNotHandledAsync(
+@"class C
+{
+    void M()
+    {
+        var v = $"""" [||]
+    }
+}");
+        }
+
         [WpfFact, Trait(Traits.Feature, Traits.Features.SplitStringLiteral)]
         public async Task TestMissingInVerbatimString()
         {