resolved conflicts

Author: retailcoder

.gitignore

@@ -83,6 +83,7 @@ _TeamCity*
 # NCrunch
 *.ncrunch*
 .*crunch*.local.xml
+_Ncrunch*
 
 # Installshield output folder
 [Ee]xpress/

RetailCoder.VBE/API/Declaration.cs

@@ -40,11 +40,11 @@ internal Declaration(RubberduckDeclaration declaration)
 
         protected RubberduckDeclaration Instance { get { return _declaration; } }
 
+        public bool IsArray { get { return _declaration.IsArray; } }
         public string Name { get { return _declaration.IdentifierName; } }
         public Accessibility Accessibility { get { return (Accessibility)_declaration.Accessibility; } }
         public DeclarationType DeclarationType {get { return TypeMappings[_declaration.DeclarationType]; }}
         public string TypeName { get { return _declaration.AsTypeName; } }
-        public bool IsArray { get { return _declaration.IsArray(); } }
 
         private static readonly IDictionary<Parsing.Symbols.DeclarationType,DeclarationType> TypeMappings =
             new Dictionary<Parsing.Symbols.DeclarationType, DeclarationType>

RetailCoder.VBE/App.cs

@@ -23,6 +23,7 @@ namespace Rubberduck
 {
     public sealed class App : IDisposable
     {
+        private const string FILE_TARGET_NAME = "file";
         private readonly VBE _vbe;
         private readonly IMessageBox _messageBox;
         private readonly IRubberduckParser _parser;
@@ -41,7 +42,7 @@ public sealed class App : IDisposable
         private readonly IConnectionPoint _projectsEventsConnectionPoint;
         private readonly int _projectsEventsCookie;
 
-        private readonly IDictionary<string, Tuple<IConnectionPoint, int>>  _componentsEventsConnectionPoints = 
+        private readonly IDictionary<string, Tuple<IConnectionPoint, int>> _componentsEventsConnectionPoints =
             new Dictionary<string, Tuple<IConnectionPoint, int>>();
         private readonly IDictionary<string, Tuple<IConnectionPoint, int>> _referencesEventsConnectionPoints =
             new Dictionary<string, Tuple<IConnectionPoint, int>>();
@@ -74,7 +75,7 @@ public App(VBE vbe, IMessageBox messageBox,
 
             _sink = new VBProjectsEventsSink();
             var connectionPointContainer = (IConnectionPointContainer)_vbe.VBProjects;
-            var interfaceId = typeof (_dispVBProjectsEvents).GUID;
+            var interfaceId = typeof(_dispVBProjectsEvents).GUID;
             connectionPointContainer.FindConnectionPoint(ref interfaceId, out _projectsEventsConnectionPoint);
 
             _sink.ProjectAdded += sink_ProjectAdded;
@@ -130,9 +131,32 @@ private bool ShouldEvaluateCanExecute(Declaration selectedDeclaration, ParserSta
 
         private void _configService_SettingsChanged(object sender, EventArgs e)
         {
+            _config = _configService.LoadConfiguration();
             // also updates the ShortcutKey text
             _appMenus.Localize();
             _hooks.HookHotkeys();
+            UpdateLoggingLevel();
+        }
+
+        private void UpdateLoggingLevel()
+        {
+            var fileRule = LogManager.Configuration.LoggingRules.Where(rule => rule.Targets.Any(t => t.Name == FILE_TARGET_NAME)).FirstOrDefault();
+            if (fileRule == null)
+            {
+                return;
+            }
+            if (_config.UserSettings.GeneralSettings.DetailedLoggingEnabled)
+            {
+                // "Enable" should have been called "Add" perhaps?
+                fileRule.EnableLoggingForLevel(LogLevel.Trace);
+                fileRule.EnableLoggingForLevel(LogLevel.Debug);
+            }
+            else
+            {
+                fileRule.DisableLoggingForLevel(LogLevel.Trace);
+                fileRule.DisableLoggingForLevel(LogLevel.Debug);
+            }
+            LogManager.ReconfigExistingLoggers();
         }
 
         public void Startup()
@@ -142,6 +166,7 @@ public void Startup()
             _appMenus.Localize();
             Task.Delay(1000).ContinueWith(t => UiDispatcher.Invoke(() => _parser.State.OnParseRequested(this))).ConfigureAwait(false);
             _hooks.HookHotkeys();
+            UpdateLoggingLevel();
         }
 
         public void Shutdown()
@@ -161,7 +186,7 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
         {
             if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
             {
-                Debug.WriteLine(string.Format("Locked project '{0}' was removed.", e.Item.Name));
+                _logger.Debug("Locked project '{0}' was removed.", e.Item.Name);
                 return;
             }
 
@@ -170,7 +195,7 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
             _referencesEventsSinks.Remove(projectId);
             _parser.State.RemoveProject(e.Item);
 
-            Debug.WriteLine(string.Format("Project '{0}' was removed.", e.Item.Name));
+            _logger.Debug("Project '{0}' was removed.", e.Item.Name);
             Tuple<IConnectionPoint, int> componentsTuple;
             if (_componentsEventsConnectionPoints.TryGetValue(projectId, out componentsTuple))
             {
@@ -186,18 +211,18 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
             }
         }
 
-        private readonly IDictionary<string,VBComponentsEventsSink> _componentsEventsSinks =
-            new Dictionary<string,VBComponentsEventsSink>();
+        private readonly IDictionary<string, VBComponentsEventsSink> _componentsEventsSinks =
+            new Dictionary<string, VBComponentsEventsSink>();
 
-        private readonly IDictionary<string,ReferencesEventsSink> _referencesEventsSinks = 
+        private readonly IDictionary<string, ReferencesEventsSink> _referencesEventsSinks =
             new Dictionary<string, ReferencesEventsSink>();
 
         async void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
         {
-            Debug.WriteLine(string.Format("Project '{0}' was added.", e.Item.Name));
+            _logger.Debug("Project '{0}' was added.", e.Item.Name);
             if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
             {
-                Debug.WriteLine("Project is protected and will not be added to parser state.");
+                _logger.Debug("Project is protected and will not be added to parser state.");
                 return;
             }
 
@@ -221,12 +246,12 @@ private void RegisterComponentsEventSink(VBComponents components, string project
             if (_componentsEventsSinks.ContainsKey(projectId))
             {
                 // already registered - this is caused by the initial load+rename of a project in the VBE
-                Debug.WriteLine("Components sink already registered.");
+                _logger.Debug("Components sink already registered.");
                 return;
             }
 
             var connectionPointContainer = (IConnectionPointContainer)components;
-            var interfaceId = typeof (_dispVBComponentsEvents).GUID;
+            var interfaceId = typeof(_dispVBComponentsEvents).GUID;
 
             IConnectionPoint connectionPoint;
             connectionPointContainer.FindConnectionPoint(ref interfaceId, out connectionPoint);
@@ -244,7 +269,7 @@ private void RegisterComponentsEventSink(VBComponents components, string project
             connectionPoint.Advise(componentsSink, out cookie);
 
             _componentsEventsConnectionPoints.Add(projectId, Tuple.Create(connectionPoint, cookie));
-            Debug.WriteLine("Components sink registered and advising.");
+            _logger.Debug("Components sink registered and advising.");
         }
 
         async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent> e)
@@ -254,7 +279,7 @@ async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent
                 return;
             }
 
-            Debug.WriteLine(string.Format("Component '{0}' was selected.", e.Item.Name));
+            _logger.Debug("Component '{0}' was selected.", e.Item.Name);
             // do something?
         }
 
@@ -265,7 +290,7 @@ async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBCom
                 return;
             }
 
-            Debug.WriteLine("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
+            _logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
 
             _parser.State.RemoveRenamedComponent(e.Item, e.OldName);
         }
@@ -277,7 +302,7 @@ async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent>
                 return;
             }
 
-            Debug.WriteLine(string.Format("Component '{0}' was removed.", e.Item.Name));
+            _logger.Debug("Component '{0}' was removed.", e.Item.Name);
             _parser.State.ClearStateCache(e.Item, true);
         }
 
@@ -288,7 +313,7 @@ async void sink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent
                 return;
             }
 
-            Debug.WriteLine(string.Format("Component '{0}' was reloaded.", e.Item.Name));
+            _logger.Debug("Component '{0}' was reloaded.", e.Item.Name);
             _parser.State.OnParseRequested(sender, e.Item);
         }
 
@@ -299,7 +324,7 @@ async void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e
                 return;
             }
 
-            Debug.WriteLine(string.Format("Component '{0}' was added.", e.Item.Name));
+            _logger.Debug("Component '{0}' was added.", e.Item.Name);
             _parser.State.OnParseRequested(sender, e.Item);
         }
 
@@ -310,7 +335,7 @@ async void sink_ComponentActivated(object sender, DispatcherEventArgs<VBComponen
                 return;
             }
 
-            Debug.WriteLine(string.Format("Component '{0}' was activated.", e.Item.Name));
+            _logger.Debug("Component '{0}' was activated.", e.Item.Name);
             // do something?
         }
 
@@ -321,7 +346,7 @@ async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProje
                 return;
             }
 
-            Debug.WriteLine("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);
+            _logger.Debug("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);
             _parser.State.RemoveProject(e.Item.HelpFile);
             _parser.State.OnParseRequested(sender);
         }
@@ -333,7 +358,7 @@ async void sink_ProjectActivated(object sender, DispatcherEventArgs<VBProject> e
                 return;
             }
 
-            Debug.WriteLine(string.Format("Project '{0}' was activated.", e.Item.Name));
+            _logger.Debug("Project '{0}' was activated.", e.Item.Name);
             // do something?
         }
         #endregion
@@ -346,7 +371,7 @@ private void _stateBar_Refresh(object sender, EventArgs e)
 
         private void Parser_StateChanged(object sender, EventArgs e)
         {
-            Debug.WriteLine("App handles StateChanged ({0}), evaluating menu states...", _parser.State.Status);
+            _logger.Debug("App handles StateChanged ({0}), evaluating menu states...", _parser.State.Status);
             _appMenus.EvaluateCanExecute(_parser.State);
         }
 
@@ -436,7 +461,7 @@ public void Dispose()
             }
 
             if (_autoSave != null)
-            { 
+            {
                 _autoSave.Dispose();
                 _autoSave = null;
             }

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -190,9 +190,7 @@ public static IEnumerable<Declaration> InScope(this IEnumerable<Declaration> dec
         public static IEnumerable<Declaration> FindInterfaces(this IEnumerable<Declaration> declarations)
         {
             var classes = declarations.Where(item => item.DeclarationType == DeclarationType.ClassModule);
-            var interfaces = classes.Where(item => item.References.Any(reference =>
-                reference.Context.Parent is VBAParser.ImplementsStmtContext));
-
+            var interfaces = classes.Where(item => ((ClassModuleDeclaration)item).Subtypes.Any(s => !s.IsBuiltIn));
             return interfaces;
         }
 
@@ -233,8 +231,8 @@ public static IEnumerable<Declaration> FindBuiltInEventHandlers(this IEnumerable
         }
 
         /// <summary>
-        /// Gets the <see cref="Declaration"/> of the specified <see cref="type"/>, 
-        /// at the specified <see cref="selection"/>.
+        /// Gets the <see cref="Declaration"/> of the specified <see cref="DeclarationType"/>, 
+        /// at the specified <see cref="QualifiedSelection"/>.
         /// Returns the declaration if selection is on an identifier reference.
         /// </summary>
         public static Declaration FindSelectedDeclaration(this IEnumerable<Declaration> declarations, QualifiedSelection selection, DeclarationType type, Func<Declaration, Selection> selector = null)
@@ -243,8 +241,8 @@ public static Declaration FindSelectedDeclaration(this IEnumerable<Declaration>
         }
 
         /// <summary>
-        /// Gets the <see cref="Declaration"/> of the specified <see cref="types"/>, 
-        /// at the specified <see cref="selection"/>.
+        /// Gets the <see cref="Declaration"/> of the specified <see cref="DeclarationType"/>, 
+        /// at the specified <see cref="QualifiedSelection"/>.
         /// Returns the declaration if selection is on an identifier reference.
         /// </summary>
         public static Declaration FindSelectedDeclaration(this IEnumerable<Declaration> declarations, QualifiedSelection selection, IEnumerable<DeclarationType> types, Func<Declaration, Selection> selector = null)
@@ -365,7 +363,7 @@ private static IEnumerable<Declaration> GetTypeMembers(this IEnumerable<Declarat
             return declarations.Where(item => item.Project != null && item.ProjectId == type.ProjectId && item.ParentScope == type.Scope);
         }
 
-            /// <summary>
+        /// <summary>
         /// Finds all class members that are interface implementation members.
         /// </summary>
         public static IEnumerable<Declaration> FindInterfaceImplementationMembers(this IEnumerable<Declaration> declarations)
@@ -532,7 +530,7 @@ public static Declaration FindInterface(this IEnumerable<Declaration> declaratio
             {
                 foreach (var reference in declaration.References)
                 {
-                    var implementsStmt = reference.Context.Parent as VBAParser.ImplementsStmtContext;
+                    var implementsStmt = ParserRuleContextHelper.GetParent<VBAParser.ImplementsStmtContext>(reference.Context);
 
                     if (implementsStmt == null) { continue; }
 

RetailCoder.VBE/Common/Hotkeys/Hotkey.cs

@@ -4,6 +4,7 @@
 using System.Windows.Forms;
 using System.Windows.Input;
 using Rubberduck.Common.WinAPI;
+using NLog;
 
 namespace Rubberduck.Common.Hotkeys
 {
@@ -12,6 +13,7 @@ public class Hotkey : IHotkey
         private readonly string _key;
         private readonly ICommand _command;
         private readonly IntPtr _hWndVbe;
+        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
         public Hotkey(IntPtr hWndVbe, string key, ICommand command, Keys secondKey = Keys.None)
         {
@@ -82,13 +84,13 @@ private void HookKey(Keys key, uint shift)
             var success = User32.RegisterHotKey(_hWndVbe, hookId, shift, (uint)key);
             if (!success)
             {
-                Debug.WriteLine(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered, key);
+                _logger.Debug(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered, key);
                 //throw new Win32Exception(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered, key);
             }
 
             HotkeyInfo = new HotkeyInfo(hookId, Combo);
             IsAttached = true;
-            Debug.WriteLine("Hotkey '{0}' hooked successfully to command '{1}'", Key, Command.GetType());  //no translation needed for Debug.Writeline
+            _logger.Debug("Hotkey '{0}' hooked successfully to command '{1}'", Key, Command.GetType());  //no translation needed for Debug.Writeline
         }
 
         private static readonly IDictionary<char,uint> Modifiers = new Dictionary<char, uint>

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -11,6 +11,7 @@
 using Rubberduck.Settings;
 using Rubberduck.UI.Command;
 using Rubberduck.UI.Command.Refactorings;
+using NLog;
 
 namespace Rubberduck.Common
 {
@@ -28,6 +29,7 @@ public class RubberduckHooks : IRubberduckHooks
         private readonly IEnumerable<ICommand> _commands;
         private readonly IList<IAttachable> _hooks = new List<IAttachable>();
         private readonly IDictionary<RubberduckHotkey, ICommand> _mappings;
+        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
         public RubberduckHooks(VBE vbe, IGeneralConfigService config, IEnumerable<ICommand> commands)
         {
@@ -151,7 +153,7 @@ public void Attach()
             }
             catch (Win32Exception exception)
             {
-                Debug.WriteLine(exception);
+                _logger.Error(exception);
             }
         }
 
@@ -172,7 +174,7 @@ public void Detach()
             }
             catch (Win32Exception exception)
             {
-                Debug.WriteLine(exception);
+                _logger.Error(exception);
             }
             IsAttached = false;
         }
@@ -182,12 +184,12 @@ private void hook_MessageReceived(object sender, HookEventArgs e)
             var hotkey = sender as IHotkey;
             if (hotkey != null)
             {
-                Debug.WriteLine("Hotkey message received");
+                _logger.Debug("Hotkey message received");
                 hotkey.Command.Execute(null);
                 return;
             }
 
-            Debug.WriteLine("Unknown message received");
+            _logger.Debug("Unknown message received");
             OnMessageReceived(sender, e);
         }
 
@@ -221,7 +223,7 @@ private IntPtr WindowProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam)
             }
             catch (Exception exception)
             {
-                Debug.WriteLine(exception);
+                _logger.Error(exception);
             }
 
             return IntPtr.Zero;
@@ -244,7 +246,7 @@ private bool HandleHotkeyMessage(IntPtr wParam)
             }
             catch (Exception exception)
             {
-                Debug.WriteLine(exception);
+                _logger.Error(exception);
             }
             return processed;
         }