From f94402f920e0ed5a28572ec614279a4af0b0cbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Sun, 8 Apr 2012 12:47:18 +0200 Subject: [PATCH] Made it easier to get the issues out of the gather visitor. --- .../CodeIssues/ConditionalToNullCoalescingIssue.cs | 6 ++---- .../CodeIssues/ExplicitConversionInForEachIssue.cs | 6 ++---- .../Refactoring/CodeIssues/GatherVisitorBase.cs | 8 +++++++- .../CodeIssues/NotImplementedExceptionIssue.cs | 6 ++---- .../Refactoring/CodeIssues/RedundantInternalIssue.cs | 6 ++---- .../CodeIssues/RedundantNamespaceUsageIssue.cs | 6 ++---- .../Refactoring/CodeIssues/RedundantPrivateIssue.cs | 6 ++---- .../Refactoring/CodeIssues/RedundantThisIssue.cs | 6 ++---- .../Refactoring/CodeIssues/RedundantUsingIssue.cs | 2 +- .../Refactoring/CodeIssues/StringIsNullOrEmptyIssue.cs | 6 ++---- .../Refactoring/CodeIssues/UseVarKeywordIssue.cs | 6 ++---- 11 files changed, 26 insertions(+), 38 deletions(-) diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs index 9763e0859c..d3499a7d9a 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ConditionalToNullCoalescingIssue.cs @@ -55,11 +55,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring ), }; - public IEnumerable GetIssues (BaseRefactoringContext context) + public IEnumerable GetIssues(BaseRefactoringContext context) { - var visitor = new GatherVisitor (context, this); - context.RootNode.AcceptVisitor (visitor); - return visitor.FoundIssues; + return new GatherVisitor(context, this).GetIssues(); } class GatherVisitor : GatherVisitorBase diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs index 4bce89dabf..b4b5dbff78 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/ExplicitConversionInForEachIssue.cs @@ -30,11 +30,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring Severity = Severity.Warning)] public class ExplicitConversionInForEachIssue : ICodeIssueProvider { - public IEnumerable GetIssues (BaseRefactoringContext context) + public IEnumerable GetIssues(BaseRefactoringContext context) { - var visitor = new GatherVisitor (context); - context.RootNode.AcceptVisitor (visitor); - return visitor.FoundIssues; + return new GatherVisitor(context).GetIssues(); } class GatherVisitor : GatherVisitorBase diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs index f505592be4..8ad996e749 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/GatherVisitorBase.cs @@ -39,7 +39,13 @@ namespace ICSharpCode.NRefactory.CSharp { this.ctx = ctx; } - + + public IEnumerable GetIssues() + { + ctx.RootNode.AcceptVisitor(this); + return FoundIssues; + } + protected override void VisitChildren (AstNode node) { if (ctx.CancellationToken.IsCancellationRequested) diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs index 69441a96c5..d10f1fe2a1 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/NotImplementedExceptionIssue.cs @@ -37,11 +37,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring [IssueDescription("Show NotImplementedExceptions", Description="Shows NotImplementedException throws in the quick task bar.", Category = IssueCategories.Notifications, Severity = Severity.Suggestion, IssueMarker = IssueMarker.None)] public class NotImplementedExceptionIssue : ICodeIssueProvider { - public IEnumerable GetIssues (BaseRefactoringContext context) + public IEnumerable GetIssues(BaseRefactoringContext context) { - var visitor = new GatherVisitor (context, this); - context.RootNode.AcceptVisitor (visitor); - return visitor.FoundIssues; + return new GatherVisitor(context, this).GetIssues(); } class GatherVisitor : GatherVisitorBase diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs index 2f958d0b1b..f30493b9c8 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantInternalIssue.cs @@ -41,11 +41,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring IssueMarker = IssueMarker.GrayOut)] public class RedundantInternalIssue : ICodeIssueProvider { - public IEnumerable GetIssues (BaseRefactoringContext context) + public IEnumerable GetIssues(BaseRefactoringContext context) { - var visitor = new GatherVisitor (context, this); - context.RootNode.AcceptVisitor (visitor); - return visitor.FoundIssues; + return new GatherVisitor(context, this).GetIssues(); } class GatherVisitor : GatherVisitorBase diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs index 8cb331d394..8c37365ed8 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantNamespaceUsageIssue.cs @@ -43,11 +43,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring IssueMarker = IssueMarker.GrayOut)] public class RedundantNamespaceUsageIssue : ICodeIssueProvider { - public IEnumerable GetIssues (BaseRefactoringContext context) + public IEnumerable GetIssues(BaseRefactoringContext context) { - var visitor = new GatherVisitor (context, this); - context.RootNode.AcceptVisitor (visitor); - return visitor.FoundIssues; + return new GatherVisitor(context, this).GetIssues(); } class GatherVisitor : GatherVisitorBase diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs index 85a40593b1..631c480cf4 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantPrivateIssue.cs @@ -41,11 +41,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring IssueMarker = IssueMarker.GrayOut)] public class RedundantPrivateIssue : ICodeIssueProvider { - public IEnumerable GetIssues (BaseRefactoringContext context) + public IEnumerable GetIssues(BaseRefactoringContext context) { - var visitor = new GatherVisitor (context, this); - context.RootNode.AcceptVisitor (visitor); - return visitor.FoundIssues; + return new GatherVisitor(context, this).GetIssues(); } class GatherVisitor : GatherVisitorBase diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantThisIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantThisIssue.cs index 7c7b9bc672..d089d71f16 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantThisIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantThisIssue.cs @@ -45,11 +45,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring IssueMarker = IssueMarker.GrayOut)] public class RedundantThisIssue : ICodeIssueProvider { - public IEnumerable GetIssues (BaseRefactoringContext context) + public IEnumerable GetIssues(BaseRefactoringContext context) { - var visitor = new GatherVisitor (context, this); - context.RootNode.AcceptVisitor (visitor); - return visitor.FoundIssues; + return new GatherVisitor(context, this).GetIssues(); } class GatherVisitor : GatherVisitorBase diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantUsingIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantUsingIssue.cs index 7fa4d4436d..dcc34c2af1 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantUsingIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/RedundantUsingIssue.cs @@ -54,7 +54,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring get { return namespacesToKeep; } } - public IEnumerable GetIssues (BaseRefactoringContext context) + public IEnumerable GetIssues(BaseRefactoringContext context) { var visitor = new GatherVisitor (context, this); context.RootNode.AcceptVisitor (visitor); diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StringIsNullOrEmptyIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StringIsNullOrEmptyIssue.cs index e8928ab1ab..9d191f63ac 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StringIsNullOrEmptyIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/StringIsNullOrEmptyIssue.cs @@ -70,11 +70,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring ), }; - public IEnumerable GetIssues (BaseRefactoringContext context) + public IEnumerable GetIssues(BaseRefactoringContext context) { - var visitor = new GatherVisitor (context, this); - context.RootNode.AcceptVisitor (visitor); - return visitor.FoundIssues; + return new GatherVisitor(context, this).GetIssues(); } class GatherVisitor : GatherVisitorBase diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs index e66c2c1c8c..74c2a0f722 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/UseVarKeywordIssue.cs @@ -43,11 +43,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring IssueMarker = IssueMarker.None)] public class UseVarKeywordIssue : ICodeIssueProvider { - public IEnumerable GetIssues (BaseRefactoringContext context) + public IEnumerable GetIssues(BaseRefactoringContext context) { - var visitor = new GatherVisitor (context, this); - context.RootNode.AcceptVisitor (visitor); - return visitor.FoundIssues; + return new GatherVisitor(context, this).GetIssues(); } class GatherVisitor : GatherVisitorBase