Make the code actoin the last argument.

src/EditorFeatures/Core/Implementation/Suggestions/CodeFixSuggestedAction.cs

@@ -25,12 +25,12 @@ internal sealed class CodeFixSuggestedAction : SuggestedActionWithFlavors, ITele
             ICodeActionEditHandlerService editHandler,
             IWaitIndicator waitIndicator,
             CodeFix fix,
-            CodeAction action,
             object provider,
             SuggestedActionSet fixAllFlavors,
-            IAsynchronousOperationListener operationListener)
+            IAsynchronousOperationListener operationListener,
+            CodeAction action)
             : base(workspace, subjectBuffer, editHandler, waitIndicator, 
-                   action, provider, operationListener, fixAllFlavors)
+                   provider, operationListener, action, fixAllFlavors)
         {
             _fix = fix;
         }

src/EditorFeatures/Core/Implementation/Suggestions/CodeRefactoringSuggestedAction.cs

@@ -18,10 +18,11 @@ internal sealed class CodeRefactoringSuggestedAction : SuggestedActionWithFlavor
             ITextBuffer subjectBuffer,
             ICodeActionEditHandlerService editHandler,
             IWaitIndicator waitIndicator,
-            CodeAction codeAction,
             CodeRefactoringProvider provider,
-            IAsynchronousOperationListener operationListener)
-            : base(workspace, subjectBuffer, editHandler, waitIndicator, codeAction, provider, operationListener)
+            IAsynchronousOperationListener operationListener,
+            CodeAction codeAction)
+            : base(workspace, subjectBuffer, editHandler, waitIndicator, 
+                   provider, operationListener, codeAction)
         {
         }
     }

src/EditorFeatures/Core/Implementation/Suggestions/FixAllSuggestedAction.cs

@@ -32,8 +32,8 @@ internal sealed partial class FixAllSuggestedAction : SuggestedAction, ITelemetr
             Diagnostic originalFixedDiagnostic,
             IAsynchronousOperationListener operationListener)
             : base(workspace, subjectBuffer, editHandler, waitIndicator,
-                  new FixAllCodeAction(fixAllState), fixAllState.FixAllProvider,
-                  operationListener)
+                  fixAllState.FixAllProvider, operationListener,
+                  new FixAllCodeAction(fixAllState))
         {
             _fixedDiagnostic = originalFixedDiagnostic;
         }

src/EditorFeatures/Core/Implementation/Suggestions/PreviewChanges/PreviewChangesSuggestedAction.cs

@@ -23,10 +23,11 @@ private sealed partial class PreviewChangesSuggestedAction : SuggestedAction
                 ITextBuffer subjectBuffer,
                 ICodeActionEditHandlerService editHandler,
                 IWaitIndicator waitIndicator,
-                PreviewChangesCodeAction codeAction,
                 object provider,
-                IAsynchronousOperationListener operationListener)
-                : base(workspace, subjectBuffer, editHandler, waitIndicator, codeAction, provider, operationListener)
+                IAsynchronousOperationListener operationListener,
+                PreviewChangesCodeAction codeAction)
+                : base(workspace, subjectBuffer, editHandler, waitIndicator, 
+                      provider, operationListener, codeAction)
             {
             }
 
@@ -45,11 +46,11 @@ private sealed partial class PreviewChangesSuggestedAction : SuggestedAction
                     return null;
                 }
 
-                var previewAction = new PreviewChangesCodeAction(
-                    suggestedAction.Workspace, suggestedAction.CodeAction, changeSummary);
                 return new PreviewChangesSuggestedAction(
                     suggestedAction.Workspace, suggestedAction.SubjectBuffer, suggestedAction.EditHandler,
-                    suggestedAction.WaitIndicator, previewAction, suggestedAction.Provider, suggestedAction.OperationListener);
+                    suggestedAction.WaitIndicator, suggestedAction.Provider, suggestedAction.OperationListener,
+                    new PreviewChangesCodeAction(
+                        suggestedAction.Workspace, suggestedAction.CodeAction, changeSummary));
             }
         }
     }

src/EditorFeatures/Core/Implementation/Suggestions/SuggestedAction.cs

@@ -41,9 +41,9 @@ internal partial class SuggestedAction : ForegroundThreadAffinitizedObject, ISug
             ITextBuffer subjectBuffer,
             ICodeActionEditHandlerService editHandler,
             IWaitIndicator waitIndicator,
-            CodeAction codeAction,
             object provider,
             IAsynchronousOperationListener operationListener,
+            CodeAction codeAction,
             IEnumerable<SuggestedActionSet> actionSets = null)
         {
             Contract.ThrowIfTrue(provider == null);

src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionWithFlavors.cs

@@ -32,11 +32,10 @@ internal abstract partial class SuggestedActionWithFlavors : SuggestedAction, IS
 
         public SuggestedActionWithFlavors(
             Workspace workspace, ITextBuffer subjectBuffer, ICodeActionEditHandlerService editHandler, 
-            IWaitIndicator waitIndicator, CodeAction codeAction, object provider, 
-            IAsynchronousOperationListener operationListener,
-            SuggestedActionSet additionalFlavors = null) 
-            : base(workspace, subjectBuffer, editHandler, waitIndicator, codeAction,
-                  provider, operationListener, actionSets: null)
+            IWaitIndicator waitIndicator, object provider, IAsynchronousOperationListener operationListener, 
+            CodeAction codeAction, SuggestedActionSet additionalFlavors = null) 
+            : base(workspace, subjectBuffer, editHandler, waitIndicator,
+                   provider, operationListener, codeAction, actionSets: null)
         {
             _additionalFlavors = additionalFlavors;
         }

src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionsSourceProvider.cs

@@ -379,7 +379,8 @@ private void ProcessFixCollection(Workspace workspace, IDictionary<CodeFixGroupK
                         {
                             nestedActions.Add(new CodeFixSuggestedAction(workspace, _subjectBuffer,
                                 _owner._editHandler, _owner._waitIndicator, fix,
-                                nestedAction, fixCollection.Provider, getFixAllSuggestedActionSet(nestedAction), _owner._listener));
+                                fixCollection.Provider, getFixAllSuggestedActionSet(nestedAction), 
+                                _owner._listener, nestedAction));
                         }
 
                         var set = new SuggestedActionSet(
@@ -387,14 +388,15 @@ private void ProcessFixCollection(Workspace workspace, IDictionary<CodeFixGroupK
                             fix.PrimaryDiagnostic.Location.SourceSpan.ToSpan());
 
                         suggestedAction = new SuggestedAction(workspace, _subjectBuffer,
-                            _owner._editHandler, _owner._waitIndicator, fix.Action,
-                            fixCollection.Provider, _owner._listener, new[] { set });
+                            _owner._editHandler, _owner._waitIndicator,
+                            fixCollection.Provider, _owner._listener, fix.Action, new[] { set });
                     }
                     else
                     {
                         suggestedAction = new CodeFixSuggestedAction(
-                            workspace, _subjectBuffer, _owner._editHandler, _owner._waitIndicator, fix,
-                            fix.Action, fixCollection.Provider, getFixAllSuggestedActionSet(fix.Action), _owner._listener);
+                            workspace, _subjectBuffer, _owner._editHandler, _owner._waitIndicator, 
+                            fix, fixCollection.Provider, getFixAllSuggestedActionSet(fix.Action), 
+                            _owner._listener, fix.Action);
                     }
 
                     AddFix(fix, suggestedAction, map, order);
@@ -418,8 +420,9 @@ private void ProcessFixCollection(Workspace workspace, IDictionary<CodeFixGroupK
                     else
                     {
                         suggestedAction = new CodeFixSuggestedAction(
-                            workspace, _subjectBuffer, _owner._editHandler, _owner._waitIndicator, fix,
-                            fix.Action, fixCollection.Provider, getFixAllSuggestedActionSet(fix.Action), _owner._listener);
+                            workspace, _subjectBuffer, _owner._editHandler, _owner._waitIndicator,
+                            fix, fixCollection.Provider, getFixAllSuggestedActionSet(fix.Action), 
+                            _owner._listener, fix.Action);
                     }
 
                     AddFix(fix, suggestedAction, map, order);
@@ -582,11 +585,11 @@ private SuggestedActionSet OrganizeRefactorings(Workspace workspace, CodeRefacto
             {
                 var refactoringSuggestedActions = ArrayBuilder<SuggestedAction>.GetInstance();
 
-                foreach (var a in refactoring.Actions)
+                foreach (var action in refactoring.Actions)
                 {
                     refactoringSuggestedActions.Add(new CodeRefactoringSuggestedAction(
                         workspace, _subjectBuffer, _owner._editHandler, _owner._waitIndicator,
-                        a, refactoring.Provider, _owner._listener));
+                        refactoring.Provider, _owner._listener, action));
                 }
 
                 return new SuggestedActionSet(

src/EditorFeatures/Core/Implementation/Suggestions/SuppressionSuggestedAction.cs

@@ -37,7 +37,8 @@ internal sealed class SuppressionSuggestedAction : SuggestedAction, ITelemetryDi
             object provider,
             Func<CodeAction, SuggestedActionSet> getFixAllSuggestedActionSet,
             IAsynchronousOperationListener operationListener)
-            : base(workspace, subjectBuffer, editHandler, waitIndicator, fix.Action, provider, operationListener)
+            : base(workspace, subjectBuffer, editHandler, waitIndicator, 
+                   provider, operationListener, fix.Action)
         {
             _fix = fix;
             _getFixAllSuggestedActionSet = getFixAllSuggestedActionSet;
@@ -69,14 +70,15 @@ public override Task<IEnumerable<SuggestedActionSet>> GetActionSetsAsync(Cancell
                 var nestedSuggestedActions = ArrayBuilder<SuggestedAction>.GetInstance();
                 var fixCount = this.CodeAction.GetCodeActions().Length;
 
-                foreach (var c in this.CodeAction.GetCodeActions())
+                foreach (var action in this.CodeAction.GetCodeActions())
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    var fixAllSuggestedActionSet = _getFixAllSuggestedActionSet(c);
+                    var fixAllSuggestedActionSet = _getFixAllSuggestedActionSet(action);
                     nestedSuggestedActions.Add(new CodeFixSuggestedAction(
-                        this.Workspace, this.SubjectBuffer, this.EditHandler, this.WaitIndicator, new CodeFix(_fix.Project, c, _fix.Diagnostics),
-                        c, this.Provider, fixAllSuggestedActionSet, this.OperationListener));
+                        this.Workspace, this.SubjectBuffer, this.EditHandler, this.WaitIndicator, 
+                        new CodeFix(_fix.Project, action, _fix.Diagnostics),
+                        this.Provider, fixAllSuggestedActionSet, this.OperationListener, action));
                 }
 
                 _actionSets = ImmutableArray.Create(