Skip to content

Commit c0998dd

Browse files
Vogel612Vogel612
authored
Merge pull request #6096 from Rsge/next
Unified QuickFix classes' layout & added Rename-QuickFix localization
2 parents c8f46f7 + 766eae8 commit c0998dd

30 files changed

+130
-126
lines changed

‎Rubberduck.CodeAnalysis/QuickFixes/Concrete/AccessSheetUsingCodeNameQuickFix.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,7 @@ public override void Fix(IInspectionResult result, IRewriteSession rewriteSessio
106106
}
107107
}
108108

109-
public override string Description(IInspectionResult result)
110-
{
111-
return Resources.Inspections.QuickFixes.AccessSheetUsingCodeNameQuickFix;
112-
}
109+
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.AccessSheetUsingCodeNameQuickFix;
113110

114111
public override bool CanFixMultiple => true;
115112
public override bool CanFixInProcedure => true;

‎Rubberduck.CodeAnalysis/QuickFixes/Concrete/AddMissingAttributeQuickFix.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ public override void Fix(IInspectionResult result, IRewriteSession rewriteSessio
7373
_attributesUpdater.AddAttribute(rewriteSession, declaration, attributeName, annotation.AttributeValues(annotationInstance));
7474
}
7575

76-
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.AddMissingAttributeQuickFix;
77-
7876
public override CodeKind TargetCodeKind => CodeKind.AttributesCode;
7977

78+
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.AddMissingAttributeQuickFix;
79+
8080
public override bool CanFixMultiple => true;
8181
public override bool CanFixInProcedure => true;
8282
public override bool CanFixInModule => true;

‎Rubberduck.CodeAnalysis/QuickFixes/Concrete/AddStepOneQuickFix.cs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,6 @@ public AddStepOneQuickFix()
4242
: base(typeof(StepIsNotSpecifiedInspection))
4343
{}
4444

45-
public override bool CanFixMultiple => true;
46-
public override bool CanFixInProcedure => true;
47-
public override bool CanFixInModule => true;
48-
public override bool CanFixInProject => true;
49-
public override bool CanFixAll => true;
50-
51-
public override string Description(IInspectionResult result)
52-
{
53-
return Resources.Inspections.QuickFixes.AddStepOneQuickFix;
54-
}
55-
5645
public override void Fix(IInspectionResult result, IRewriteSession rewriteSession)
5746
{
5847
var rewriter = rewriteSession.CheckOutModuleRewriter(result.QualifiedSelection.QualifiedName);
@@ -76,5 +65,13 @@ private static int GetToExpressionEnd(ForNextStmtContext context)
7665

7766
throw new InvalidOperationException();
7867
}
68+
69+
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.AddStepOneQuickFix;
70+
71+
public override bool CanFixMultiple => true;
72+
public override bool CanFixInProcedure => true;
73+
public override bool CanFixInModule => true;
74+
public override bool CanFixInProject => true;
75+
public override bool CanFixAll => true;
7976
}
8077
}

‎Rubberduck.CodeAnalysis/QuickFixes/Concrete/AdjustAttributeValuesQuickFix.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ public override void Fix(IInspectionResult result, IRewriteSession rewriteSessio
8585
_attributesUpdater.UpdateAttribute(rewriteSession, declaration, attributeName, attributeValuesFromAnnotation, oldValues: attributeValues);
8686
}
8787

88-
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.AdjustAttributeValuesQuickFix;
89-
9088
public override CodeKind TargetCodeKind => CodeKind.AttributesCode;
9189

90+
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.AdjustAttributeValuesQuickFix;
91+
9292
public override bool CanFixMultiple => true;
9393
public override bool CanFixInProcedure => true;
9494
public override bool CanFixInModule => true;

‎Rubberduck.CodeAnalysis/QuickFixes/Concrete/AnnotateEntryPointQuickFix.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ public AnnotateEntryPointQuickFix(IAnnotationUpdater annotationUpdater, Rubberdu
4444
_annotationUpdater = annotationUpdater;
4545
}
4646

47-
public override bool CanFixMultiple => true;
48-
public override bool CanFixInProcedure => true;
49-
public override bool CanFixInModule => true;
50-
public override bool CanFixInProject => true;
51-
public override bool CanFixAll => true;
52-
5347
public override void Fix(IInspectionResult result, IRewriteSession rewriteSession)
5448
{
5549
var module = result.QualifiedSelection.QualifiedName;
@@ -65,5 +59,11 @@ public override void Fix(IInspectionResult result, IRewriteSession rewriteSessio
6559
}
6660

6761
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.AnnotateEntryPointQuickFix;
62+
63+
public override bool CanFixMultiple => true;
64+
public override bool CanFixInProcedure => true;
65+
public override bool CanFixInModule => true;
66+
public override bool CanFixInProject => true;
67+
public override bool CanFixAll => true;
6868
}
6969
}

‎Rubberduck.CodeAnalysis/QuickFixes/Concrete/AssignedByValParameterMakeLocalCopyQuickFix.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,6 @@ public override void Fix(IInspectionResult result, IRewriteSession rewriteSessio
7777
InsertLocalVariableDeclarationAndAssignment(rewriter, result.Target, localIdentifier);
7878
}
7979

80-
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.AssignedByValParameterMakeLocalCopyQuickFix;
81-
82-
public override bool CanFixMultiple => false;
83-
public override bool CanFixInProcedure => false;
84-
public override bool CanFixInModule => false;
85-
public override bool CanFixInProject => false;
86-
public override bool CanFixAll => false;
87-
8880
private string PromptForLocalVariableName(Declaration target)
8981
{
9082
IAssignedByValParameterQuickFixDialog view = null;
@@ -165,5 +157,14 @@ private void InsertLocalVariableDeclarationAndAssignment(IModuleRewriter rewrite
165157
rewriter.Remove(endOfStmtCtxt);
166158
rewriter.InsertAfter(insertCtxt.Stop.TokenIndex, $"{endOfStmtCtxtComment}{endOfStmtCtxtEndFormat}{localVariableDeclaration}" + $"{endOfStmtCtxtEndFormat}{localVariableAssignment}{endOfStmtCtxtEndFormat}");
167159
}
160+
161+
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.AssignedByValParameterMakeLocalCopyQuickFix;
162+
163+
public override bool CanFixMultiple => false;
164+
public override bool CanFixInProcedure => false;
165+
public override bool CanFixInModule => false;
166+
public override bool CanFixInProject => false;
167+
public override bool CanFixAll => false;
168+
168169
}
169170
}

‎Rubberduck.CodeAnalysis/QuickFixes/Concrete/ChangeIntegerToLongQuickFix.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,6 @@ public override void Fix(IInspectionResult result, IRewriteSession rewriteSessio
194194
}
195195
}
196196

197-
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.IntegerDataTypeQuickFix;
198-
199-
public override bool CanFixMultiple => true;
200-
public override bool CanFixInProcedure => true;
201-
public override bool CanFixInModule => true;
202-
public override bool CanFixInProject => true;
203-
public override bool CanFixAll => true;
204-
205197
private static int GetParameterIndex(VBAParser.ArgContext context)
206198
{
207199
return Array.IndexOf(((VBAParser.ArgListContext)context.Parent).arg().ToArray(), context);
@@ -212,5 +204,13 @@ private static void ReplaceTypeHint(RuleContext context, IModuleRewriter rewrite
212204
var typeHintContext = ((ParserRuleContext)context).GetDescendent<VBAParser.TypeHintContext>();
213205
rewriter.Replace(typeHintContext, "&");
214206
}
207+
208+
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.IntegerDataTypeQuickFix;
209+
210+
public override bool CanFixMultiple => true;
211+
public override bool CanFixInProcedure => true;
212+
public override bool CanFixInModule => true;
213+
public override bool CanFixInProject => true;
214+
public override bool CanFixAll => true;
215215
}
216216
}

‎Rubberduck.CodeAnalysis/QuickFixes/Concrete/ChangeProcedureToFunctionQuickFix.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ public override void Fix(IInspectionResult result, IRewriteSession rewriteSessio
6666
}
6767
}
6868

69-
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.ProcedureShouldBeFunctionInspectionQuickFix;
70-
7169
private void UpdateSignature(Declaration target, ParameterDeclaration arg, IRewriteSession rewriteSession)
7270
{
7371
var subStmt = (VBAParser.SubStmtContext) target.Context;
@@ -107,6 +105,8 @@ private void UpdateCall(IdentifierReference reference, int argIndex, IRewriteSes
107105
rewriter.InsertAfter(argListContext.Stop.TokenIndex, ")");
108106
}
109107

108+
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.ProcedureShouldBeFunctionInspectionQuickFix;
109+
110110
public override bool CanFixMultiple => true;
111111
public override bool CanFixInProcedure => false;
112112
public override bool CanFixInModule => false;

‎Rubberduck.CodeAnalysis/QuickFixes/Concrete/ConvertToProcedureQuickFix.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,6 @@ private static void ConvertExitPropertyStatements(VBAParser.PropertyGetStmtConte
180180
}
181181
}
182182

183-
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.ConvertFunctionToProcedureQuickFix;
184-
185-
public override bool CanFixMultiple => true;
186-
public override bool CanFixInProcedure => false;
187-
public override bool CanFixInModule => true;
188-
public override bool CanFixInProject => false;
189-
public override bool CanFixAll => false;
190-
191183
private IEnumerable<ParserRuleContext> GetReturnStatements(Declaration declaration)
192184
{
193185
return declaration.References
@@ -200,5 +192,13 @@ private bool IsReturnStatement(Declaration declaration, IdentifierReference assi
200192
{
201193
return assignment.ParentScoping.Equals(declaration) && assignment.Declaration.Equals(declaration);
202194
}
195+
196+
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.ConvertFunctionToProcedureQuickFix;
197+
198+
public override bool CanFixMultiple => true;
199+
public override bool CanFixInProcedure => false;
200+
public override bool CanFixInModule => true;
201+
public override bool CanFixInProject => false;
202+
public override bool CanFixAll => false;
203203
}
204204
}

‎Rubberduck.CodeAnalysis/QuickFixes/Concrete/DeclareAsExplicitTypeQuickFix.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,17 @@ public DeclareAsExplicitTypeQuickFix(ImplicitTypeToExplicitRefactoringAction ref
8484
_refactoring = refactoringAction;
8585
}
8686

87-
public override bool CanFixMultiple => true;
88-
public override bool CanFixInProcedure => false;
89-
public override bool CanFixInModule => true;
90-
public override bool CanFixInProject => true;
91-
public override bool CanFixAll => true;
92-
9387
public override void Fix(IInspectionResult result, IRewriteSession rewriteSession)
9488
{
9589
_refactoring.Refactor(new ImplicitTypeToExplicitModel(result.Target), rewriteSession);
9690
}
9791

98-
public override string Description(IInspectionResult result)
99-
=> Resources.Inspections.QuickFixes.DeclareAsExplicitTypeQuickFix;
92+
public override string Description(IInspectionResult result) => Resources.Inspections.QuickFixes.DeclareAsExplicitTypeQuickFix;
93+
94+
public override bool CanFixMultiple => true;
95+
public override bool CanFixInProcedure => false;
96+
public override bool CanFixInModule => true;
97+
public override bool CanFixInProject => true;
98+
public override bool CanFixAll => true;
10099
}
101100
}

0 commit comments

Comments
 (0)