From 45fb764ecd979cb8a9289b6dcdbfc07c2b856449 Mon Sep 17 00:00:00 2001 From: CyrusNajmabadi Date: Thu, 20 Oct 2016 16:45:22 -0700 Subject: [PATCH] Make the code actoin the last argument. --- .../Suggestions/CodeFixSuggestedAction.cs | 6 +++--- .../CodeRefactoringSuggestedAction.cs | 7 ++++--- .../Suggestions/FixAllSuggestedAction.cs | 4 ++-- .../PreviewChangesSuggestedAction.cs | 13 ++++++------ .../Suggestions/SuggestedAction.cs | 2 +- .../Suggestions/SuggestedActionWithFlavors.cs | 9 ++++---- .../SuggestedActionsSourceProvider.cs | 21 +++++++++++-------- .../Suggestions/SuppressionSuggestedAction.cs | 12 ++++++----- 8 files changed, 40 insertions(+), 34 deletions(-) diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/CodeFixSuggestedAction.cs b/src/EditorFeatures/Core/Implementation/Suggestions/CodeFixSuggestedAction.cs index 8b496ef2bbf..0e326b2bc7b 100644 --- a/src/EditorFeatures/Core/Implementation/Suggestions/CodeFixSuggestedAction.cs +++ b/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; } diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/CodeRefactoringSuggestedAction.cs b/src/EditorFeatures/Core/Implementation/Suggestions/CodeRefactoringSuggestedAction.cs index ae8eb2d8936..11bcb19d511 100644 --- a/src/EditorFeatures/Core/Implementation/Suggestions/CodeRefactoringSuggestedAction.cs +++ b/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) { } } diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/FixAllSuggestedAction.cs b/src/EditorFeatures/Core/Implementation/Suggestions/FixAllSuggestedAction.cs index ee18bec08bc..da554fd6caa 100644 --- a/src/EditorFeatures/Core/Implementation/Suggestions/FixAllSuggestedAction.cs +++ b/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; } diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/PreviewChanges/PreviewChangesSuggestedAction.cs b/src/EditorFeatures/Core/Implementation/Suggestions/PreviewChanges/PreviewChangesSuggestedAction.cs index d090ed74999..e281dfc7150 100644 --- a/src/EditorFeatures/Core/Implementation/Suggestions/PreviewChanges/PreviewChangesSuggestedAction.cs +++ b/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)); } } } diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedAction.cs b/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedAction.cs index 000c128b5cd..d893d3cad32 100644 --- a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedAction.cs +++ b/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 actionSets = null) { Contract.ThrowIfTrue(provider == null); diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionWithFlavors.cs b/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionWithFlavors.cs index f557442968c..7a40fb13201 100644 --- a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionWithFlavors.cs +++ b/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; } diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionsSourceProvider.cs b/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionsSourceProvider.cs index e4a9ed4191e..99176dd85ed 100644 --- a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionsSourceProvider.cs +++ b/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionsSourceProvider.cs @@ -379,7 +379,8 @@ private void ProcessFixCollection(Workspace workspace, IDictionary.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( diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuppressionSuggestedAction.cs b/src/EditorFeatures/Core/Implementation/Suggestions/SuppressionSuggestedAction.cs index d6460598680..28cb4090735 100644 --- a/src/EditorFeatures/Core/Implementation/Suggestions/SuppressionSuggestedAction.cs +++ b/src/EditorFeatures/Core/Implementation/Suggestions/SuppressionSuggestedAction.cs @@ -37,7 +37,8 @@ internal sealed class SuppressionSuggestedAction : SuggestedAction, ITelemetryDi object provider, Func 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> GetActionSetsAsync(Cancell var nestedSuggestedActions = ArrayBuilder.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( -- GitLab