Merge branch 'autoboosh-commentnodes' into next

Author: retailcoder

README.md

@@ -2,13 +2,11 @@
 
 | Branch     | Build Status |
 |------------|--------------|
-| **master** | [![master branch build status][masterBuildStatus]][masterBuild] |
-| **next**   | [![next branch build status][nextBuildStatus]][nextBuild] |
+| **master** | ![master branch build status][masterBuildStatus] |
+| **next**   | ![next branch build status][nextBuildStatus] |
 
-[nextBuild]:https://ci.appveyor.com/project/ckuhn203/rubberduck-3v9qv/branch/next
-[nextBuildStatus]:https://ci.appveyor.com/api/projects/status/bfwl1pwu9eeqd11o/branch/next?svg=true
-[masterBuild]:https://ci.appveyor.com/project/ckuhn203/rubberduck-3v9qv/branch/master
-[masterBuildStatus]:https://ci.appveyor.com/api/projects/status/bfwl1pwu9eeqd11o/branch/master?svg=true
+[nextBuildStatus]:https://ci.appveyor.com/api/projects/status/we3pdnkeebo4nlck/branch/next?svg=true
+[masterBuildStatus]:https://ci.appveyor.com/api/projects/status/we3pdnkeebo4nlck/branch/master?svg=true
 
 Rubberduck is a COM Add-In for the VBA IDE that makes VBA development even more enjoyable, by extending the Visual Basic Editor (VBE) with menus, toolbars and toolwindows that enable things we didn't even think were possible when we first started this project.
 
@@ -88,6 +86,12 @@ LibGit2Sharp is the library that has allowed us to integrate Git right into the
 
 Which basically means it's a reimplementation of Git in C. It also [happens to be the technology Microsoft uses for their own Git integration with Visual Studio](http://www.hanselman.com/blog/GitSupportForVisualStudioGitTFSAndVSPutIntoContext.aspx).
 
+###[WPF Localization Using RESX Files](http://www.codeproject.com/Articles/35159/WPF-Localization-Using-RESX-Files)
+
+This library makes localizing WPF applications at runtime using resx files a breeze. Thank you [Grant Frisken](http://www.codeproject.com/script/Membership/View.aspx?mid=1079060)!
+
+> Licensed under [The Code Project Open License](http://www.codeproject.com/info/cpol10.aspx).
+
 ##Icons
 
 We didn't come up with these icons ourselves! Here's who did what:
@@ -110,9 +114,3 @@ For more information, please see the EULAs in the [./Resources/Microsoft/ direct
 
  * [Visual Studio 2013 Image Library EULA](https://github.com/retailcoder/Rubberduck/blob/master/RetailCoder.VBE/Resources/Microsoft/Visual%20Studio%202013%20Image%20Library%20EULA.rtf)
  * [Visual Studio 2012 Image Library EULA](https://github.com/retailcoder/Rubberduck/blob/master/RetailCoder.VBE/Resources/Microsoft/Visual%20Studio%202012%20Image%20Library%20EULA.rtf)
-
-###[WPF Localization Using RESX Files](http://www.codeproject.com/Articles/35159/WPF-Localization-Using-RESX-Files)
-
-This library makes localizing WPF applications at runtime using resx files a breeze. Thank you [Grant Frisken](http://www.codeproject.com/script/Membership/View.aspx?mid=1079060)!
-
-> Licensed under [The Code Project Open License](http://www.codeproject.com/info/cpol10.aspx).

RetailCoder.VBE/App.cs

@@ -30,7 +30,7 @@ public class App : IDisposable
         private readonly AutoSave.AutoSave _autoSave;
         private readonly IGeneralConfigService _configService;
         private readonly IAppMenu _appMenus;
-        private readonly ParserStateCommandBar _stateBar;
+        private readonly RubberduckCommandBar _stateBar;
         private readonly IIndenter _indenter;
         private readonly IRubberduckHooks _hooks;
 
@@ -44,9 +44,9 @@ public App(VBE vbe, IMessageBox messageBox,
             IInspectorFactory inspectorFactory,
             IGeneralConfigService configService,
             IAppMenu appMenus,
-            ParserStateCommandBar stateBar,
-            IIndenter indenter,
-            IRubberduckHooks hooks)
+            RubberduckCommandBar stateBar,
+            IIndenter indenter/*,
+            IRubberduckHooks hooks*/)
         {
             _vbe = vbe;
             _messageBox = messageBox;
@@ -58,10 +58,10 @@ public App(VBE vbe, IMessageBox messageBox,
             _appMenus = appMenus;
             _stateBar = stateBar;
             _indenter = indenter;
-            _hooks = hooks;
+            //_hooks = hooks;
             _logger = LogManager.GetCurrentClassLogger();
 
-            _hooks.MessageReceived += hooks_MessageReceived;
+            //_hooks.MessageReceived += hooks_MessageReceived;
             _configService.SettingsChanged += _configService_SettingsChanged;
             _parser.State.StateChanged += Parser_StateChanged;
             _stateBar.Refresh += _stateBar_Refresh;
@@ -190,14 +190,14 @@ private void LoadConfig()
             var currentCulture = RubberduckUI.Culture;
             try
             {
-                CultureManager.UICulture = CultureInfo.GetCultureInfo(_config.UserSettings.LanguageSetting.Code);
+                CultureManager.UICulture = CultureInfo.GetCultureInfo(_config.UserSettings.GeneralSettings.Language.Code);
                 _appMenus.Localize();
             }
             catch (CultureNotFoundException exception)
             {
                 _logger.Error(exception, "Error Setting Culture for RubberDuck");
                 _messageBox.Show(exception.Message, "Rubberduck", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _config.UserSettings.LanguageSetting.Code = currentCulture.Name;
+                _config.UserSettings.GeneralSettings.Language.Code = currentCulture.Name;
                 _configService.SaveConfiguration(_config);
             }
         }
@@ -210,12 +210,12 @@ private void Setup()
 
         public void Dispose()
         {
-            _hooks.MessageReceived -= hooks_MessageReceived;
+            //_hooks.MessageReceived -= hooks_MessageReceived;
             _configService.SettingsChanged -= _configService_SettingsChanged;
             _parser.State.StateChanged -= Parser_StateChanged;
             _autoSave.Dispose();
 
-            _hooks.Dispose();
+            //_hooks.Dispose();
         }
     }
 }

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -3,12 +3,14 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
 using Microsoft.Vbe.Interop;
-using Rubberduck.Annotations;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Properties;
+using Rubberduck.UI;
 using Rubberduck.VBEditor;
 // ReSharper disable LocalizableElement
 
@@ -18,6 +20,11 @@ public static class DeclarationExtensions
     {
         private static readonly DeclarationIconCache Cache = new DeclarationIconCache();
 
+        public static string ToLocalizedString(this DeclarationType type)
+        {
+            return RubberduckUI.ResourceManager.GetString("DeclarationType_" + type);
+        }
+
         public static BitmapImage BitmapImage(this Declaration declaration)
         {
             return Cache[declaration];

RetailCoder.VBE/Controls/GroupingGrid/GroupingGrid.xaml

@@ -3,7 +3,6 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.UI;
 
 namespace Rubberduck.Inspections
 {
@@ -12,21 +11,22 @@ public sealed class AssignedByValParameterInspection : InspectionBase
         public AssignedByValParameterInspection(RubberduckParserState state)
             : base(state)
         {
-            Severity = CodeInspectionSeverity.Warning;
+            Severity = DefaultSeverity;
         }
 
+        public override string Meta { get { return InspectionsUI.AssignedByValParameterInspectionMeta; } }
         public override string Description { get { return InspectionsUI.AssignedByValParameterInspectionName; } }
         public override CodeInspectionType InspectionType { get { return CodeInspectionType.CodeQualityIssues; } }
 
-        public override IEnumerable<CodeInspectionResultBase> GetInspectionResults()
+        public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
             var assignedByValParameters = UserDeclarations.Where(declaration => 
                     declaration.DeclarationType == DeclarationType.Parameter
                     && ((VBAParser.ArgContext)declaration.Context).BYVAL() != null
                     && declaration.References.Any(reference => reference.IsAssignment));
 
             var issues = assignedByValParameters
-                .Select(param => new AssignedByValParameterInspectionResult(this, string.Format(Description, param.IdentifierName), param.Context, param.QualifiedName));
+                .Select(param => new AssignedByValParameterInspectionResult(this, param.Context, param.QualifiedName));
 
             return issues;
         }

RetailCoder.VBE/Controls/GroupingGrid/GroupingGrid.xaml.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Grammar;
@@ -7,19 +6,27 @@
 
 namespace Rubberduck.Inspections
 {
-    public class AssignedByValParameterInspectionResult : CodeInspectionResultBase
+    public class AssignedByValParameterInspectionResult : InspectionResultBase
     {
         private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;
 
-        public AssignedByValParameterInspectionResult(IInspection inspection, string result, ParserRuleContext context, QualifiedMemberName qualifiedName)
-            : base(inspection, result, qualifiedName.QualifiedModuleName, context)
+        public AssignedByValParameterInspectionResult(IInspection inspection, ParserRuleContext context, QualifiedMemberName qualifiedName)
+            : base(inspection, qualifiedName.QualifiedModuleName, context)
         {
             _quickFixes = new[]
             {
                 new PassParameterByReferenceQuickFix(context, QualifiedSelection),
             };
         }
 
+        public override string Description
+        {
+            get
+            {
+                return string.Format(InspectionsUI.AssignedByValParameterInspectionResultFormat, Target.IdentifierName);
+            }
+        }
+
         public override IEnumerable<CodeInspectionQuickFix> QuickFixes { get { return _quickFixes; } }
     }
 
@@ -28,8 +35,8 @@ public AssignedByValParameterInspectionResult(IInspection inspection, string res
     /// </summary>
     public class PassParameterByReferenceQuickFix : CodeInspectionQuickFix
     {
-        public PassParameterByReferenceQuickFix(ParserRuleContext context, QualifiedSelection selection) 
-            : base(context, selection, RubberduckUI.Inspections_PassParamByReference)
+        public PassParameterByReferenceQuickFix(ParserRuleContext context, QualifiedSelection selection)
+            : base(context, selection, InspectionsUI.PassParameterByReferenceQuickFix)
         {
         }
 

RetailCoder.VBE/Inspections/AssignedByValParameterInspection.cs

@@ -17,7 +17,7 @@ public CodeInspectionQuickFix(ParserRuleContext context, QualifiedSelection sele
         }
 
         public string Description { get { return _description; } }
-        protected ParserRuleContext Context { get { return _context; } }
+        public ParserRuleContext Context { get { return _context; } }
         public QualifiedSelection Selection { get { return _selection; } }
 
         public abstract void Fix();

RetailCoder.VBE/Inspections/AssignedByValParameterInspectionResult.cs

@@ -2,10 +2,25 @@
 {
     public enum CodeInspectionSeverity
     {
+        /// <summary>
+        /// Inspection will not run.
+        /// </summary>
         DoNotShow,
+        /// <summary>
+        /// Low severity setting.
+        /// </summary>
         Hint,
+        /// <summary>
+        /// Medium-low severity setting.
+        /// </summary>
         Suggestion,
+        /// <summary>
+        /// Medium-high severity setting.
+        /// </summary>
         Warning,
+        /// <summary>
+        /// High severity setting.
+        /// </summary>
         Error
     }
 }

RetailCoder.VBE/Inspections/CodeInspectionQuickFix.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace Rubberduck.Inspections
+{
+    public sealed class CompositeCodeInspectionFix : CodeInspectionQuickFix
+    {
+        private readonly CodeInspectionQuickFix _root;
+        private readonly List<CodeInspectionQuickFix> _children;
+
+        public CompositeCodeInspectionFix(CodeInspectionQuickFix root)
+            : base(root.Context, root.Selection, root.Description)
+        {
+            _root = root;
+            _children = new List<CodeInspectionQuickFix>();
+        }
+
+        public void AddChild(CodeInspectionQuickFix quickFix)
+        {
+            _children.Add(quickFix);
+        }
+
+        public override void Fix()
+        {
+            _root.Fix();
+            _children.ForEach(child => child.Fix());
+        }
+    }
+}