Fix only attributes can cause refactorings crash (dotnet#37837).

petrroll · Aug 8, 2019 · a97815e · a97815e
1 parent f42de27
commit a97815e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/src/EditorFeatures/CSharpTest/RefactoringHelpers/RefactoringHelpersTests.cs b/src/EditorFeatures/CSharpTest/RefactoringHelpers/RefactoringHelpersTests.cs
@@ -527,6 +527,22 @@ public class Class1
             await TestMissingAsync<MethodDeclarationSyntax>(testText);
         }
 
+        [Fact]
+        [WorkItem(37837, "https://github.com/dotnet/roslyn/issues/37837")]
+        public async Task TestEmptyParameter()
+        {
+            var testText = @"
+using System;
+public class Class1
+{
+    static void foo({|result:[Test][||]
+|}    {
+
+    }
+}";
+            await TestAsync<ParameterSyntax>(testText);
+        }
+
         [Fact]
         [WorkItem(37584, "https://github.com/dotnet/roslyn/issues/37584")]
         public async Task TestMissingEmptyMember2()

diff --git a/...orkspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs b/...orkspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs
@@ -542,11 +542,22 @@ protected TNode TryGetAncestorForLocation<TNode>(int position, SyntaxNode root)
 
         protected int GetStartOfNodeExcludingAttributes(SyntaxNode node)
         {
-            var attributeLists = GetAttributeLists(node);
-            var start = attributeLists.LastOrDefault()?.GetLastToken().GetNextToken().SpanStart ??
-                        node.SpanStart;
+            var attributeList = GetAttributeLists(node);
+            if (attributeList.Any())
+            {
+                var endOfAttributeLists = attributeList.Last().Span.End;
+                var afterAttributesToken = node.FindTokenOnRightOfPosition(endOfAttributeLists);
+
+                var endOfNode = node.Span.End;
+                var startOfTokenAfterAttributes = afterAttributesToken.Span.Start;
+                var startOfNodeWithoutAttributes = endOfNode >= startOfTokenAfterAttributes
+                    ? afterAttributesToken.Span.Start
+                    : endOfNode;
+
+                return startOfNodeWithoutAttributes;
+            }
 
-            return start;
+            return node.SpanStart;
         }
 
         public abstract SyntaxList<SyntaxNode> GetAttributeLists(SyntaxNode node);