diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToVirtualFunctionFromConstructorIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToVirtualFunctionFromConstructorIssue.cs index ffbb520888..c8ea4f71ab 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToVirtualFunctionFromConstructorIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/CallToVirtualFunctionFromConstructorIssue.cs @@ -29,8 +29,8 @@ using ICSharpCode.NRefactory.Semantics; namespace ICSharpCode.NRefactory.CSharp.Refactoring { - [IssueDescription("Virtual functions should not be called from constructors", - Description = "Warns about calls to virtual member functions occuring int the constructor.", + [IssueDescription("Constructors should not call virtual members", + Description = "Warns about calls to virtual member functions occuring in the constructor.", Category = IssueCategories.CodeQualityIssues, Severity = Severity.Warning)] public class CallToVirtualFunctionFromConstructorIssue : ICodeIssueProvider @@ -76,7 +76,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring return; if (targetMethod.IsVirtualCall) AddIssue(invocationExpression, - context.TranslateString("Calling virtual functions in constructors is bad practice.")); + context.TranslateString("Calling virtual functions in constructors is bad practice")); } } } diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectExceptionParameterOrderingIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectExceptionParameterOrderingIssue.cs index 74fd470786..531e9d83f3 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectExceptionParameterOrderingIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/IncorrectExceptionParameterOrderingIssue.cs @@ -77,14 +77,20 @@ namespace ICSharpCode.NRefactory.CSharp return; if (!func(leftLength, rightLength)) AddIssue(objectCreateExpression, - context.TranslateString("Swap parameters"), - script => { - var newOCE = objectCreateExpression.Clone() as ObjectCreateExpression; - newOCE.Arguments.Clear(); - newOCE.Arguments.Add(secondParam.Clone()); - newOCE.Arguments.Add(firstParam.Clone()); - script.Replace(objectCreateExpression, newOCE); - }); + context.TranslateString("The parameters are in the wrong order"), + GetActions(objectCreateExpression, firstParam, secondParam)); + } + + IEnumerable GetActions(ObjectCreateExpression objectCreateExpression, + PrimitiveExpression firstParam, PrimitiveExpression secondParam) + { + yield return new CodeAction(context.TranslateString("Swap parameters"), script => { + var newOCE = objectCreateExpression.Clone() as ObjectCreateExpression; + newOCE.Arguments.Clear(); + newOCE.Arguments.Add(secondParam.Clone()); + newOCE.Arguments.Add(firstParam.Clone()); + script.Replace(objectCreateExpression, newOCE); + }); } } } diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SetterDoesNotUseValueParameterIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SetterDoesNotUseValueParameterIssue.cs index 2f19552e64..6a0ba4c67c 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SetterDoesNotUseValueParameterIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/SetterDoesNotUseValueParameterIssue.cs @@ -86,7 +86,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring }, CancellationToken.None); if(!referenceFound) - AddIssue(node, context.TranslateString("The setter does not use the 'value' parameter.")); + AddIssue(node, context.TranslateString("The setter does not use the 'value' parameter")); } } }