Merge pull request #21076 from CyrusNajmabadi/genConstructorCaretPlac…

…ement Place caret in parameter list when generating constructors.
dotnet · Jul 27, 2017 · 93f2d3c · 93f2d3c
2 parents 76a6960 + 0dde8ac
commit 93f2d3c
Show file tree

Hide file tree

Showing 40 changed files with 197 additions and 93 deletions.
diff --git a/...GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs b/...GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs
@@ -33,7 +33,7 @@ class Z
 {
     int a;
 
-    public Z(int a)
+    public Z(int a{|Navigation:)|}
     {
         this.a = a;
     }
@@ -56,7 +56,7 @@ class Z
 {
     int a;
 
-    public Z(int a) => this . a = a ;
+    public Z(int a{|Navigation:)|} => this . a = a ;
 }",
 options: Option(CSharpCodeStyleOptions.PreferExpressionBodiedConstructors, CSharpCodeStyleOptions.WhenPossibleWithNoneEnforcement));
         }
@@ -77,7 +77,7 @@ class Z
 {
     int a;
 
-    public Z(int a) => this . a = a ;
+    public Z(int a{|Navigation:)|} => this . a = a ;
 }",
 options: Option(CSharpCodeStyleOptions.PreferExpressionBodiedConstructors, CSharpCodeStyleOptions.WhenOnSingleLineWithNoneEnforcement));
         }
@@ -100,7 +100,7 @@ class Z
     int a;
     int b;
 
-    public Z(int a, int b)
+    public Z(int a, int b{|Navigation:)|}
     {
         this . a = a ;
         this . b = b ;
@@ -127,7 +127,7 @@ class Z
     int a;
     string b;
 
-    public Z(int a, string b)
+    public Z(int a, string b{|Navigation:)|}
     {
         this.a = a;
         this.b = b;
@@ -163,7 +163,7 @@ public Z(int a)
         this.a = a;
     }
 
-    public Z(string b)
+    public Z(string b{|Navigation:)|}
     {
         this.b = b;
     }
@@ -198,7 +198,7 @@ public Z(int a)
         this.a = a;
     }
 
-    public Z(int a, string b)
+    public Z(int a, string b{|Navigation:)|}
     {
         this.a = a;
         this.b = b;
@@ -234,7 +234,7 @@ public Z(int a)
         this.a = a;
     }
 
-    public Z(int a, string b)
+    public Z(int a, string b{|Navigation:)|}
     {
         this.a = a;
         this.b = b;
@@ -270,7 +270,7 @@ public Z(int a)
         this.a = a;
     }
 
-    public Z(int a, string b) : this(a)
+    public Z(int a, string b{|Navigation:)|} : this(a)
     {
         this.b = b;
     }
@@ -294,7 +294,7 @@ public Z(int a)
         this.a = a;
     }
 
-    public Z(int a, string b)
+    public Z(int a, string b{|Navigation:)|}
     {
         this.a = a;
         this.b = b;
@@ -313,7 +313,7 @@ await TestInRegularAndScriptAsync(
 }",
 @"class Z
 {
-    public Z(int a, string b)
+    public Z(int a, string b{|Navigation:)|}
     {
         A = a;
         B = b;
@@ -335,7 +335,7 @@ await TestInRegularAndScriptAsync(
 }",
 @"class Z
 {
-    public Z(int a, string b)
+    public Z(int a, string b{|Navigation:)|}
     {
         this.A = a;
         this.B = b;
@@ -362,7 +362,7 @@ struct S
 {
     int i;
 
-    public S(int i)
+    public S(int i{|Navigation:)|}
     {
         this.i = i;
     }
@@ -383,7 +383,7 @@ struct S
 
 struct S
 {
-    public S(int i) : this()
+    public S(int i{|Navigation:)|} : this()
     {
         this.i = i;
     }
@@ -412,7 +412,7 @@ struct S
 
     int y;
 
-    public S(int y) : this()
+    public S(int y{|Navigation:)|} : this()
     {
         this.y = y;
     }
@@ -439,7 +439,7 @@ struct S
 
     int y;
 
-    public S(int i) : this()
+    public S(int i{|Navigation:)|} : this()
     {
         this.i = i;
     }
@@ -462,7 +462,7 @@ class Program<T>
 {
     int i;
 
-    public Program(int i)
+    public Program(int i{|Navigation:)|}
     {
         this.i = i;
     }
@@ -534,7 +534,7 @@ await TestInRegularAndScriptAsync(
 {
     int yield;
 
-    public Program(int yield)
+    public Program(int yield{|Navigation:)|}
     {
         this.yield = yield;
     }
@@ -577,7 +577,7 @@ class Z
 {
     (int, string) a;
 
-    public Z((int, string) a)
+    public Z((int, string) a{|Navigation:)|}
     {
         this.a = a;
     }
@@ -597,7 +597,7 @@ await TestInRegularAndScriptAsync(
 {
     int _field;
 
-    public Program(int field)
+    public Program(int field{|Navigation:)|}
     {
         _field = field;
     }
@@ -617,7 +617,7 @@ await TestInRegularAndScriptAsync(
 {
     int _field;
 
-    public Program(int field)
+    public Program(int field{|Navigation:)|}
     {
         this._field = field;
     }
@@ -637,7 +637,7 @@ await TestInRegularAndScriptAsync(
 }",
 @"abstract class Contribution
 {
-    protected Contribution(string title, int number)
+    protected Contribution(string title, int number{|Navigation:)|}
     {
         Title = title;
         Number = number;
@@ -679,7 +679,7 @@ class Z
 {
     int a;
 
-    public Z(int a)
+    public Z(int a{|Navigation:)|}
     {
         this.a = a;
     }
@@ -703,7 +703,7 @@ class Z
 {
     int a;
 
-    public Z(int a)
+    public Z(int a{|Navigation:)|}
     {
         this.a = a;
     }
@@ -741,7 +741,7 @@ class Z
 {
     int a;
 
-    public Z()
+    public Z({|Navigation:)|}
     {
     }
 }",
@@ -767,7 +767,7 @@ class Z
     int a;
     string b;
 
-    public Z(string b, int a)
+    public Z(string b, int a{|Navigation:)|}
     {
         this.b = b;
         this.a = a;
@@ -799,7 +799,7 @@ class Z
     int a;
     string b;
 
-    public Z(int a, string b)
+    public Z(int a, string b{|Navigation:)|}
     {
         this.a = a;
         this.b = b ?? throw new ArgumentNullException(nameof(b));
@@ -832,7 +832,7 @@ class Z
     int a;
     string b;
 
-    public Z(int a, string b)
+    public Z(int a, string b{|Navigation:)|}
     {
         if (b == null)
         {
@@ -900,6 +900,30 @@ public void N() { }
 }");
         }
 
+        [WorkItem(21067, "https://github.com/dotnet/roslyn/pull/21067")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateConstructorFromMembers)]
+        public async Task TestFinalCaretPosition()
+        {
+            await TestInRegularAndScriptAsync(
+@"using System.Collections.Generic;
+
+class Z
+{
+    [|int a;|]
+}",
+@"using System.Collections.Generic;
+
+class Z
+{
+    int a;
+
+    public Z(int a{|Navigation:)|}
+    {
+        this.a = a;
+    }
+}");
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateConstructorFromMembers)]
         [WorkItem(20595, "https://github.com/dotnet/roslyn/issues/20595")]
         public async Task ProtectedConstructorShouldBeGeneratedForAbstractClass()
@@ -911,7 +935,7 @@ await TestInRegularAndScriptAsync(
 }",
 @"abstract class C 
 {
-    protected C(int prop) 
+    protected C(int prop{|Navigation:)|}
     {
         Prop = prop;
     } 

diff --git a/src/EditorFeatures/Core/Implementation/CodeActions/CodeActionEditHandlerService.cs b/src/EditorFeatures/Core/Implementation/CodeActions/CodeActionEditHandlerService.cs
@@ -176,7 +176,7 @@ public async Task ApplyAsync(
             }
 
             var updatedSolution = operations.OfType<ApplyChangesOperation>().FirstOrDefault()?.ChangedSolution ?? oldSolution;
-            TryStartRenameSession(workspace, oldSolution, updatedSolution, cancellationToken);
+            TryNavigateToLocationOrStartRenameSession(workspace, oldSolution, updatedSolution, cancellationToken);
         }
 
         private TextDocument TryGetSingleChangedText(
@@ -259,7 +259,7 @@ private static void ProcessOperations(
             }
         }
 
-        private void TryStartRenameSession(Workspace workspace, Solution oldSolution, Solution newSolution, CancellationToken cancellationToken)
+        private void TryNavigateToLocationOrStartRenameSession(Workspace workspace, Solution oldSolution, Solution newSolution, CancellationToken cancellationToken)
         {
             var changedDocuments = newSolution.GetChangedDocuments(oldSolution);
             foreach (var documentId in changedDocuments)
@@ -272,9 +272,16 @@ private void TryStartRenameSession(Workspace workspace, Solution oldSolution, So
 
                 var root = document.GetSyntaxRootSynchronously(cancellationToken);
 
-                var renameTokenOpt = root.GetAnnotatedNodesAndTokens(RenameAnnotation.Kind)
-                                         .Where(s => s.IsToken)
-                                         .Select(s => s.AsToken())
+                var navigationTokenOpt = root.GetAnnotatedTokens(NavigationAnnotation.Kind)
+                                             .FirstOrNullable();
+                if (navigationTokenOpt.HasValue)
+                {
+                    var navigationService = workspace.Services.GetService<IDocumentNavigationService>();
+                    navigationService.TryNavigateToPosition(workspace, documentId, navigationTokenOpt.Value.SpanStart);
+                    return;
+                }
+
+                var renameTokenOpt = root.GetAnnotatedTokens(RenameAnnotation.Kind)
                                          .FirstOrNullable();
 
                 if (renameTokenOpt.HasValue)

diff --git a/src/EditorFeatures/TestUtilities/ChangeSignature/AbstractChangeSignatureTests.cs b/src/EditorFeatures/TestUtilities/ChangeSignature/AbstractChangeSignatureTests.cs
@@ -8,6 +8,7 @@
 using Microsoft.CodeAnalysis.ChangeSignature;
 using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions;
 using Microsoft.CodeAnalysis.Notification;
+using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 using Xunit;
 
@@ -39,9 +40,11 @@ public async Task TestChangeSignatureViaCodeActionAsync(
 
                     var codeIssueOrRefactoring = await GetCodeRefactoringAsync(workspace, testOptions);
                     await TestActionsAsync(workspace, expectedCode, index, codeIssueOrRefactoring.Actions,
-                        conflictSpans: ImmutableArray<Text.TextSpan>.Empty,
-                        renameSpans: ImmutableArray<Text.TextSpan>.Empty,
-                        warningSpans: ImmutableArray<Text.TextSpan>.Empty, ignoreTrivia: true);
+                        conflictSpans: ImmutableArray<TextSpan>.Empty,
+                        renameSpans: ImmutableArray<TextSpan>.Empty,
+                        warningSpans: ImmutableArray<TextSpan>.Empty, 
+                        navigationSpans: ImmutableArray<TextSpan>.Empty,
+                        ignoreTrivia: true);
                 }
             }
             else