Close #1680 (#1691)

Hosch250 · retailcoder · commit 71a9ab580c8a · 2016-06-03T19:35:44.000-04:00
diff --git a/RetailCoder.VBE/Inspections/FunctionReturnValueNotUsedInspectionResult.cs b/RetailCoder.VBE/Inspections/FunctionReturnValueNotUsedInspectionResult.cs
@@ -4,13 +4,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.UI;
 
 namespace Rubberduck.Inspections
 {
     public class FunctionReturnValueNotUsedInspectionResult : InspectionResultBase
     {
         private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;
-        private QualifiedMemberName _memberName;
 
         public FunctionReturnValueNotUsedInspectionResult(
             IInspection inspection,
@@ -49,5 +49,10 @@ public override string Description
                 return string.Format(InspectionsUI.FunctionReturnValueNotUsedInspectionResultFormat, Target.IdentifierName);
             }
         }
+
+        public override NavigateCodeEventArgs GetNavigationArgs()
+        {
+            return new NavigateCodeEventArgs(Target);
+        }
     }
 }
diff --git a/RetailCoder.VBE/Inspections/IdentifierNotUsedInspectionResult.cs b/RetailCoder.VBE/Inspections/IdentifierNotUsedInspectionResult.cs
@@ -2,20 +2,19 @@
 using Antlr4.Runtime;
 using Rubberduck.Common;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.UI;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Inspections
 {
     public class IdentifierNotUsedInspectionResult : InspectionResultBase
     {
-        private readonly Declaration _target;
         private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;
 
         public IdentifierNotUsedInspectionResult(IInspection inspection, Declaration target,
             ParserRuleContext context, QualifiedModuleName qualifiedName)
-            : base(inspection, qualifiedName, context)
+            : base(inspection, qualifiedName, context, target)
         {
-            _target = target;
             _quickFixes = new CodeInspectionQuickFix[]
             {
                 new RemoveUnusedDeclarationQuickFix(context, QualifiedSelection), 
@@ -28,9 +27,14 @@ public override string Description
         {
             get
             {
-                return string.Format(InspectionsUI.IdentifierNotUsedInspectionResultFormat, _target.DeclarationType.ToLocalizedString(), _target.IdentifierName);
+                return string.Format(InspectionsUI.IdentifierNotUsedInspectionResultFormat, Target.DeclarationType.ToLocalizedString(), Target.IdentifierName);
             }
         }
+
+        public override NavigateCodeEventArgs GetNavigationArgs()
+        {
+            return new NavigateCodeEventArgs(Target);
+        }
     }
 
     /// <summary>
diff --git a/RetailCoder.VBE/Inspections/ImplicitPublicMemberInspectionResult.cs b/RetailCoder.VBE/Inspections/ImplicitPublicMemberInspectionResult.cs
@@ -3,6 +3,7 @@
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.UI;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Inspections
@@ -30,6 +31,11 @@ public override string Description
                 return string.Format(InspectionsUI.ImplicitPublicMemberInspectionResultFormat, Target.IdentifierName);
             }
         }
+
+        public override NavigateCodeEventArgs GetNavigationArgs()
+        {
+            return new NavigateCodeEventArgs(Target);
+        }
     }
 
     public class SpecifyExplicitPublicModifierQuickFix : CodeInspectionQuickFix
diff --git a/RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspection.cs b/RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspection.cs
@@ -32,7 +32,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                                 && ProcedureTypes.Contains(item.DeclarationType)
                                 && !item.IsTypeSpecified
                                let issue = new {Declaration = item, QualifiedContext = new QualifiedContext<ParserRuleContext>(item.QualifiedName, item.Context)}
-                               select new ImplicitVariantReturnTypeInspectionResult(this, issue.Declaration.IdentifierName, issue.QualifiedContext);
+                               select new ImplicitVariantReturnTypeInspectionResult(this, issue.Declaration.IdentifierName, issue.QualifiedContext, item);
             return issues;
         }
     }
diff --git a/RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspectionResult.cs b/RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspectionResult.cs
@@ -2,7 +2,9 @@
 using Antlr4.Runtime;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA.Nodes;
+using Rubberduck.UI;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Inspections
@@ -12,8 +14,8 @@ public sealed class ImplicitVariantReturnTypeInspectionResult : InspectionResult
         private readonly string _identifierName;
         private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;
 
-        public ImplicitVariantReturnTypeInspectionResult(IInspection inspection, string identifierName, QualifiedContext<ParserRuleContext> qualifiedContext)
-            : base(inspection, qualifiedContext.ModuleName, qualifiedContext.Context)
+        public ImplicitVariantReturnTypeInspectionResult(IInspection inspection, string identifierName, QualifiedContext<ParserRuleContext> qualifiedContext, Declaration target)
+            : base(inspection, qualifiedContext.ModuleName, qualifiedContext.Context, target)
         {
             _identifierName = identifierName;
             _quickFixes = new CodeInspectionQuickFix[]
@@ -33,6 +35,11 @@ public override string Description
                     _identifierName);
             }
         }
+
+        public override NavigateCodeEventArgs GetNavigationArgs()
+        {
+            return new NavigateCodeEventArgs(Target);
+        }
     }
 
     public class SetExplicitVariantReturnTypeQuickFix : CodeInspectionQuickFix
diff --git a/RetailCoder.VBE/Inspections/InspectionResultBase.cs b/RetailCoder.VBE/Inspections/InspectionResultBase.cs
@@ -108,7 +108,7 @@ public override string ToString()
                 QualifiedSelection.Selection.StartLine);
         }
 
-        public NavigateCodeEventArgs GetNavigationArgs()
+        public virtual NavigateCodeEventArgs GetNavigationArgs()
         {
             return new NavigateCodeEventArgs(QualifiedSelection);
         }
diff --git a/RetailCoder.VBE/Inspections/NonReturningFunctionInspectionResult.cs b/RetailCoder.VBE/Inspections/NonReturningFunctionInspectionResult.cs
@@ -2,6 +2,7 @@
 using Antlr4.Runtime;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.UI;
 
 namespace Rubberduck.Inspections
 {
@@ -33,5 +34,10 @@ public override string Description
                 return string.Format(InspectionsUI.NonReturningFunctionInspectionResultFormat, Target.IdentifierName);
             }
         }
+
+        public override NavigateCodeEventArgs GetNavigationArgs()
+        {
+            return new NavigateCodeEventArgs(Target);
+        }
     }
 }
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionImageSourceConverter.cs b/RetailCoder.VBE/UI/Inspections/InspectionImageSourceConverter.cs
@@ -21,7 +21,8 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            throw new NotImplementedException();
+            var converter = new InspectionSeverityImageSourceConverter();
+            return converter.ConvertBack(value, targetType, parameter, culture);
         }
     }
 }
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionResultsControl.xaml b/RetailCoder.VBE/UI/Inspections/InspectionResultsControl.xaml
@@ -554,7 +554,7 @@
                                ItemsSource="{Binding Source={StaticResource ResultsByInspectionType}}"
                                Visibility="{Binding IsChecked, ElementName=GroupByInspectionType, Converter={StaticResource BoolToVisibility}}">
             <DataGrid.Columns>
-                <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeInspectionResults_Type}">
+                <DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeInspectionResults_Type}" SortDirection="Descending">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate DataType="inspections:ICodeInspectionResult">
                             <Image Source="{Binding Inspection, Converter={StaticResource InspectionIconConverter}}" Height="16" />
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionSeverityImageSourceConverter.cs b/RetailCoder.VBE/UI/Inspections/InspectionSeverityImageSourceConverter.cs
@@ -3,6 +3,7 @@
 using System.Drawing;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -15,7 +16,6 @@ public class InspectionSeverityImageSourceConverter : IValueConverter
         private static readonly IDictionary<CodeInspectionSeverity,ImageSource> Icons = 
             new Dictionary<CodeInspectionSeverity, ImageSource>
             {
-                { CodeInspectionSeverity.DoNotShow, null },
                 { CodeInspectionSeverity.Hint, ToImageSource(Properties.Resources.information_white) },
                 { CodeInspectionSeverity.Suggestion, ToImageSource(Properties.Resources.information) },
                 { CodeInspectionSeverity.Warning, ToImageSource(Properties.Resources.exclamation) },
@@ -35,7 +35,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            throw new NotImplementedException();
+            return Icons.First(f => f.Value == value).Key;
         }
 
         private static ImageSource ToImageSource(Image source)

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using System.Linq;`
`6`	`6`	`using Rubberduck.Parsing.Symbols;`
	`7`	`+using Rubberduck.UI;`
`7`	`8`
`8`	`9`	`namespace Rubberduck.Inspections`
`9`	`10`	`{`
`10`	`11`	`public class FunctionReturnValueNotUsedInspectionResult : InspectionResultBase`
`11`	`12`	`{`
`12`	`13`	`private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;`
`13`		`- private QualifiedMemberName _memberName;`
`14`	`14`
`15`	`15`	`public FunctionReturnValueNotUsedInspectionResult(`
`16`	`16`	`IInspection inspection,`
`@@ -49,5 +49,10 @@ public override string Description`
`49`	`49`	`return string.Format(InspectionsUI.FunctionReturnValueNotUsedInspectionResultFormat, Target.IdentifierName);`
`50`	`50`	`}`
`51`	`51`	`}`
	`52`	`+`
	`53`	`+ public override NavigateCodeEventArgs GetNavigationArgs()`
	`54`	`+ {`
	`55`	`+ return new NavigateCodeEventArgs(Target);`
	`56`	`+ }`
`52`	`57`	`}`
`53`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,20 +2,19 @@`
`2`	`2`	`using Antlr4.Runtime;`
`3`	`3`	`using Rubberduck.Common;`
`4`	`4`	`using Rubberduck.Parsing.Symbols;`
	`5`	`+using Rubberduck.UI;`
`5`	`6`	`using Rubberduck.VBEditor;`
`6`	`7`
`7`	`8`	`namespace Rubberduck.Inspections`
`8`	`9`	`{`
`9`	`10`	`public class IdentifierNotUsedInspectionResult : InspectionResultBase`
`10`	`11`	`{`
`11`		`- private readonly Declaration _target;`
`12`	`12`	`private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;`
`13`	`13`
`14`	`14`	`public IdentifierNotUsedInspectionResult(IInspection inspection, Declaration target,`
`15`	`15`	`ParserRuleContext context, QualifiedModuleName qualifiedName)`
`16`		`- : base(inspection, qualifiedName, context)`
	`16`	`+ : base(inspection, qualifiedName, context, target)`
`17`	`17`	`{`
`18`		`- _target = target;`
`19`	`18`	`_quickFixes = new CodeInspectionQuickFix[]`
`20`	`19`	`{`
`21`	`20`	`new RemoveUnusedDeclarationQuickFix(context, QualifiedSelection),`
`@@ -28,9 +27,14 @@ public override string Description`
`28`	`27`	`{`
`29`	`28`	`get`
`30`	`29`	`{`
`31`		`- return string.Format(InspectionsUI.IdentifierNotUsedInspectionResultFormat, _target.DeclarationType.ToLocalizedString(), _target.IdentifierName);`
	`30`	`+ return string.Format(InspectionsUI.IdentifierNotUsedInspectionResultFormat, Target.DeclarationType.ToLocalizedString(), Target.IdentifierName);`
`32`	`31`	`}`
`33`	`32`	`}`
	`33`	`+`
	`34`	`+ public override NavigateCodeEventArgs GetNavigationArgs()`
	`35`	`+ {`
	`36`	`+ return new NavigateCodeEventArgs(Target);`
	`37`	`+ }`
`34`	`38`	`}`
`35`	`39`
`36`	`40`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using Rubberduck.Parsing;`
`4`	`4`	`using Rubberduck.Parsing.Grammar;`
`5`	`5`	`using Rubberduck.Parsing.Symbols;`
	`6`	`+using Rubberduck.UI;`
`6`	`7`	`using Rubberduck.VBEditor;`
`7`	`8`
`8`	`9`	`namespace Rubberduck.Inspections`
`@@ -30,6 +31,11 @@ public override string Description`
`30`	`31`	`return string.Format(InspectionsUI.ImplicitPublicMemberInspectionResultFormat, Target.IdentifierName);`
`31`	`32`	`}`
`32`	`33`	`}`
	`34`	`+`
	`35`	`+ public override NavigateCodeEventArgs GetNavigationArgs()`
	`36`	`+ {`
	`37`	`+ return new NavigateCodeEventArgs(Target);`
	`38`	`+ }`
`33`	`39`	`}`
`34`	`40`
`35`	`41`	`public class SpecifyExplicitPublicModifierQuickFix : CodeInspectionQuickFix`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()`
`32`	`32`	`&& ProcedureTypes.Contains(item.DeclarationType)`
`33`	`33`	`&& !item.IsTypeSpecified`
`34`	`34`	`let issue = new {Declaration = item, QualifiedContext = new QualifiedContext<ParserRuleContext>(item.QualifiedName, item.Context)}`
`35`		`- select new ImplicitVariantReturnTypeInspectionResult(this, issue.Declaration.IdentifierName, issue.QualifiedContext);`
	`35`	`+ select new ImplicitVariantReturnTypeInspectionResult(this, issue.Declaration.IdentifierName, issue.QualifiedContext, item);`
`36`	`36`	`return issues;`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public override string ToString()`
`108`	`108`	`QualifiedSelection.Selection.StartLine);`
`109`	`109`	`}`
`110`	`110`
`111`		`- public NavigateCodeEventArgs GetNavigationArgs()`
	`111`	`+ public virtual NavigateCodeEventArgs GetNavigationArgs()`
`112`	`112`	`{`
`113`	`113`	`return new NavigateCodeEventArgs(QualifiedSelection);`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Antlr4.Runtime;`
`3`	`3`	`using Rubberduck.Parsing;`
`4`	`4`	`using Rubberduck.Parsing.Symbols;`
	`5`	`+using Rubberduck.UI;`
`5`	`6`
`6`	`7`	`namespace Rubberduck.Inspections`
`7`	`8`	`{`
`@@ -33,5 +34,10 @@ public override string Description`
`33`	`34`	`return string.Format(InspectionsUI.NonReturningFunctionInspectionResultFormat, Target.IdentifierName);`
`34`	`35`	`}`
`35`	`36`	`}`
	`37`	`+`
	`38`	`+ public override NavigateCodeEventArgs GetNavigationArgs()`
	`39`	`+ {`
	`40`	`+ return new NavigateCodeEventArgs(Target);`
	`41`	`+ }`
`36`	`42`	`}`
`37`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ public object Convert(object value, Type targetType, object parameter, CultureIn`
`21`	`21`
`22`	`22`	`public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)`
`23`	`23`	`{`
`24`		`- throw new NotImplementedException();`
	`24`	`+ var converter = new InspectionSeverityImageSourceConverter();`
	`25`	`+ return converter.ConvertBack(value, targetType, parameter, culture);`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`	`}`