diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/TypeParameterNotUsedIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/TypeParameterNotUsedIssue.cs index 458a093dc2..2db3ae615a 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/TypeParameterNotUsedIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/TypeParameterNotUsedIssue.cs @@ -73,6 +73,8 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring public override void VisitTypeParameterDeclaration (TypeParameterDeclaration decl) { + base.VisitTypeParameterDeclaration (decl); + var resolveResult = ctx.Resolve (decl) as TypeResolveResult; if (resolveResult == null) return; @@ -87,8 +89,6 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring return; AddIssue (decl.NameToken, ctx.TranslateString ("Type parameter is never used")); - - base.VisitTypeParameterDeclaration (decl); } } } diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/LocalVariableNotUsedIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/LocalVariableNotUsedIssue.cs index 5fe832bcf7..d9186ec66d 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/LocalVariableNotUsedIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/LocalVariableNotUsedIssue.cs @@ -52,6 +52,8 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring public override void VisitVariableInitializer (VariableInitializer variableInitializer) { + base.VisitVariableInitializer (variableInitializer); + // check if variable is assigned if (!variableInitializer.Initializer.IsNull) return; @@ -78,11 +80,12 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring script.Replace (decl, newDeclaration); } }); - base.VisitVariableInitializer (variableInitializer); } public override void VisitForeachStatement (ForeachStatement foreachStatement) { + base.VisitForeachStatement (foreachStatement); + var resolveResult = ctx.Resolve (foreachStatement.VariableNameToken) as LocalResolveResult; if (resolveResult == null) return; @@ -91,8 +94,6 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring return; AddIssue (foreachStatement.VariableNameToken, ctx.TranslateString ("Local variable is never used")); - - base.VisitForeachStatement (foreachStatement); } } diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/ParameterNotUsedIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/ParameterNotUsedIssue.cs index 06fad288cc..1e62fa654f 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/ParameterNotUsedIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableNotUsedIssues/ParameterNotUsedIssue.cs @@ -53,6 +53,8 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring public override void VisitParameterDeclaration (ParameterDeclaration parameterDeclaration) { + base.VisitParameterDeclaration (parameterDeclaration); + var resolveResult = ctx.Resolve (parameterDeclaration) as LocalResolveResult; if (resolveResult == null) return; @@ -60,8 +62,6 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring return; AddIssue (parameterDeclaration.NameToken, ctx.TranslateString ("Parameter is never used")); - - base.VisitParameterDeclaration (parameterDeclaration); } } } diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/LocalVariableOnlyAssignedIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/LocalVariableOnlyAssignedIssue.cs index f086e1b7ff..0cd37fa8f4 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/LocalVariableOnlyAssignedIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/LocalVariableOnlyAssignedIssue.cs @@ -53,6 +53,8 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring public override void VisitVariableInitializer (VariableInitializer variableInitializer) { + base.VisitVariableInitializer (variableInitializer); + var decl = variableInitializer.Parent as VariableDeclarationStatement; if (decl == null) return; @@ -64,8 +66,6 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring return; AddIssue (variableInitializer.NameToken, ctx.TranslateString ("Local variable is assigned by its value is never used")); - - base.VisitVariableInitializer (variableInitializer); } } } diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs index 14bc816110..3436117aaf 100644 --- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs +++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/VariableOnlyAssignedIssues/ParameterOnlyAssignedIssue.cs @@ -53,6 +53,8 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring public override void VisitParameterDeclaration (ParameterDeclaration parameterDeclaration) { + base.VisitParameterDeclaration (parameterDeclaration); + var resolveResult = ctx.Resolve (parameterDeclaration) as LocalResolveResult; if (resolveResult == null) return; @@ -60,8 +62,6 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring return; AddIssue (parameterDeclaration.NameToken, ctx.TranslateString ("Parameter is assigned by its value is never used")); - - base.VisitParameterDeclaration (parameterDeclaration); } } }