Merge pull request #11073 from diryboy/edge

Fix edge cases typing Enter before /**/ comments.
dotnet · May 11, 2016 · 555f4fa · 555f4fa
2 parents 96088de + a9f4855
commit 555f4fa
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 1 deletion.
diff --git a/src/EditorFeatures/CSharp/BlockCommentEditing/BlockCommentEditingCommandHandler.cs b/src/EditorFeatures/CSharp/BlockCommentEditing/BlockCommentEditingCommandHandler.cs
@@ -171,7 +171,8 @@ private static bool IsCaretInsideBlockCommentSyntax(SnapshotPoint caretPosition)
             var syntaxTree = document.GetSyntaxTreeAsync().WaitAndGetResult(CancellationToken.None);
             var trivia = syntaxTree.FindTriviaAndAdjustForEndOfFile(caretPosition, CancellationToken.None);
 
-            return trivia.IsKind(SyntaxKind.MultiLineCommentTrivia) || trivia.IsKind(SyntaxKind.MultiLineDocumentationCommentTrivia);
+            var isBlockComment = trivia.IsKind(SyntaxKind.MultiLineCommentTrivia) || trivia.IsKind(SyntaxKind.MultiLineDocumentationCommentTrivia);
+            return isBlockComment && trivia.FullSpan.Start < caretPosition;
         }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest/BlockCommentEditing/BlockCommentEditingTests.cs b/src/EditorFeatures/CSharpTest/BlockCommentEditing/BlockCommentEditingTests.cs
@@ -15,6 +15,62 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.BlockCommentEditing
 {
     public class BlockCommentEditingTests : AbstractBlockCommentEditingTests
     {
+        [WorkItem(11057, "https://github.com/dotnet/roslyn/issues/11057")]
+        [WpfFact, Trait(Traits.Feature, Traits.Features.BlockCommentEditing)]
+        public async Task EdgeCase0()
+        {
+            var code = @"
+$$/**/
+";
+            var expected = @"
+
+$$/**/
+";
+            await VerifyAsync(code, expected);
+        }
+
+        [WorkItem(11057, "https://github.com/dotnet/roslyn/issues/11057")]
+        [WpfFact, Trait(Traits.Feature, Traits.Features.BlockCommentEditing)]
+        public async Task EdgeCase1()
+        {
+            var code = @"
+/**/$$
+";
+            var expected = @"
+/**/
+$$
+";
+            await VerifyAsync(code, expected);
+        }
+
+        [WorkItem(11056, "https://github.com/dotnet/roslyn/issues/11056")]
+        [WpfFact, Trait(Traits.Feature, Traits.Features.BlockCommentEditing)]
+        public async Task EdgeCase2()
+        {
+            var code = @"
+$$/* */
+";
+            var expected = @"
+
+$$/* */
+";
+            await VerifyAsync(code, expected);
+        }
+
+        [WorkItem(11056, "https://github.com/dotnet/roslyn/issues/11056")]
+        [WpfFact, Trait(Traits.Feature, Traits.Features.BlockCommentEditing)]
+        public async Task EdgeCase3()
+        {
+            var code = @"
+/* */$$
+";
+            var expected = @"
+/* */
+$$
+";
+            await VerifyAsync(code, expected);
+        }
+
         [WpfFact, Trait(Traits.Feature, Traits.Features.BlockCommentEditing)]
         public async Task InsertOnStartLine0()
         {