Merge pull request #1863 from rubberduck-vba/next

Merge next into master

Author: Hosch250

License.rtf

@@ -46,7 +46,7 @@
 {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid12126636 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 
 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid12126636 Rubberduck is a COM add-in for the VBA IDE (VBE).
 \par 
-\par Copyright (C) 2014-2015 Mathieu Guindon & Christopher McClellan
+\par Copyright (C) 2014-2016 Mathieu Guindon & Christopher McClellan
 \par 
 \par This program is free software: you can redistribute it and/or modify
 \par it under the terms of the GNU General Public License as published by
@@ -845,4 +845,4 @@ ffffffffffffffffffffffffffffffff52006f006f007400200045006e0074007200790000000000
 40e4695ed001feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000105000000000000}}
+0000000000000000000000000000000000000000000000000105000000000000}}

RetailCoder.VBE/API/ParserState.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -8,6 +9,7 @@
 using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.Parsing.Preprocessing;
 using System.Globalization;
+using Rubberduck.Parsing.Symbols;
 
 namespace Rubberduck.API
 {
@@ -65,7 +67,8 @@ public void Initialize(VBE vbe)
             }
             Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture));
             _attributeParser = new AttributeParser(new ModuleExporter(), preprocessorFactory);
-            _parser = new RubberduckParser(vbe, _state, _attributeParser, preprocessorFactory);
+            _parser = new RubberduckParser(vbe, _state, _attributeParser, preprocessorFactory,
+                new List<ICustomDeclarationLoader> { new DebugDeclarations(_state), new FormEventDeclarations(_state) });
         }
 
         /// <summary>

RetailCoder.VBE/App.cs

@@ -79,7 +79,6 @@ public App(VBE vbe, IMessageBox messageBox,
 
             _hooks.MessageReceived += _hooks_MessageReceived;
             _configService.SettingsChanged += _configService_SettingsChanged;
-            _configService.LanguageChanged += ConfigServiceLanguageChanged;
             _parser.State.StateChanged += Parser_StateChanged;
             _parser.State.StatusMessageUpdate += State_StatusMessageUpdate;
             _stateBar.Refresh += _stateBar_Refresh;
@@ -156,13 +155,18 @@ private bool ShouldEvaluateCanExecute(Declaration selectedDeclaration, ParserSta
                    (selectedDeclaration == null && _lastSelectedDeclaration != null);
         }
 
-        private void _configService_SettingsChanged(object sender, EventArgs e)
+        private void _configService_SettingsChanged(object sender, ConfigurationChangedEventArgs e)
         {
             _config = _configService.LoadConfiguration();
             _hooks.HookHotkeys();
             // also updates the ShortcutKey text
             _appMenus.Localize();
             UpdateLoggingLevel();
+
+            if (e.LanguageChanged)
+            {
+                LoadConfig();
+            }
         }
 
         private void UpdateLoggingLevel()
@@ -172,7 +176,7 @@ private void UpdateLoggingLevel()
 
         public void Startup()
         {
-            CleanReloadConfig();
+            LoadConfig();
             _appMenus.Initialize();
             _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
             _appMenus.Localize();
@@ -417,16 +421,6 @@ private void Parser_StateChanged(object sender, EventArgs e)
             _appMenus.EvaluateCanExecute(_parser.State);
         }
 
-        private void CleanReloadConfig()
-        {
-            LoadConfig();
-        }
-
-        private void ConfigServiceLanguageChanged(object sender, EventArgs e)
-        {
-            CleanReloadConfig();
-        }
-
         private void LoadConfig()
         {
             _logger.Debug("Loading configuration");
@@ -488,7 +482,6 @@ public void Dispose()
             if (_configService != null)
             {
                 _configService.SettingsChanged -= _configService_SettingsChanged;
-                _configService.LanguageChanged -= ConfigServiceLanguageChanged;
                 _configService = null;
             }
 

RetailCoder.VBE/AutoSave/AutoSave.cs

@@ -69,7 +69,7 @@ private void Dispose(bool disposing)
 
             if (_configService != null)
             {
-                _configService.LanguageChanged -= ConfigServiceSettingsChanged;
+                _configService.SettingsChanged -= ConfigServiceSettingsChanged;
             }
 
             if (_timer != null)

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -8,6 +8,7 @@
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.VBA;
 using Rubberduck.Properties;
 using Rubberduck.UI;
 using Rubberduck.VBEditor;
@@ -330,9 +331,9 @@ public static Declaration FindSelectedDeclaration(this IEnumerable<Declaration>
             return declaration;
         }
 
-        public static IEnumerable<Declaration> FindFormEventHandlers(this IEnumerable<Declaration> declarations)
+        public static IEnumerable<Declaration> FindFormEventHandlers(this RubberduckParserState state)
         {
-            var items = declarations.ToList();
+            var items = state.AllDeclarations.ToList();
 
             var forms = items.Where(item => item.DeclarationType == DeclarationType.ClassModule
                 && item.QualifiedName.QualifiedModuleName.Component != null
@@ -342,18 +343,24 @@ public static IEnumerable<Declaration> FindFormEventHandlers(this IEnumerable<De
             var result = new List<Declaration>();
             foreach (var declaration in forms)
             {
-                result.AddRange(FindFormEventHandlers(items, declaration));
+                result.AddRange(FindFormEventHandlers(state, declaration));
             }
 
             return result;
         }
 
-        public static IEnumerable<Declaration> FindFormEventHandlers(this IEnumerable<Declaration> declarations, Declaration userForm)
+        public static IEnumerable<Declaration> FindFormEventHandlers(this RubberduckParserState state, Declaration userForm)
         {
-            var items = declarations as IList<Declaration> ?? declarations.ToList();
+            var items = state.AllDeclarations.ToList();
             var events = items.Where(item => item.IsBuiltIn
-                                                     && item.ParentScope == "MSForms.UserForm"
+                                                     && item.ParentScope == "FM20.DLL;MSForms.FormEvents"
                                                      && item.DeclarationType == DeclarationType.Event).ToList();
+
+            var e = items.Where(item => item.DeclarationType == DeclarationType.Event).ToList();
+            var e1 = items.Where(item => item.DeclarationType == DeclarationType.Event && item.IdentifierName == "QueryClose").ToList();
+
+            var s = items.Where(item => item.IdentifierName.Contains("QueryClose") || item.IdentifierName.Contains("Initialize") || item.IdentifierName.Contains("Activate")).ToList();
+
             var handlerNames = events.Select(item => "UserForm_" + item.IdentifierName);
             var handlers = items.Where(item => item.ParentScope == userForm.Scope
                                                        && item.DeclarationType == DeclarationType.Procedure

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -188,6 +188,12 @@ public void Detach()
 
         private void hook_MessageReceived(object sender, HookEventArgs e)
         {
+            var active = User32.GetForegroundWindow();
+            if (active != _mainWindowHandle)
+            {
+                return;
+            }
+
             var hotkey = sender as IHotkey;
             if (hotkey != null)
             {
@@ -210,18 +216,9 @@ private IntPtr WindowProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam)
             try
             {
                 var suppress = false;
-                if (hWnd == _mainWindowHandle)
+                if (hWnd == _mainWindowHandle && (WM)uMsg == WM.HOTKEY)
                 {
-                    switch ((WM)uMsg)
-                    {
-                        case WM.HOTKEY:
-                            suppress = HandleHotkeyMessage(wParam);
-                            break;
-
-                        case WM.ACTIVATEAPP:
-                            HandleActivateAppMessage(wParam);
-                            break;
-                    }
+                    suppress = HandleHotkeyMessage(wParam);
                 }
 
                 return suppress 
@@ -257,29 +254,5 @@ private bool HandleHotkeyMessage(IntPtr wParam)
             }
             return processed;
         }
-
-        private void HandleActivateAppMessage(IntPtr wParam)
-        {
-            const int WA_INACTIVE = 0;
-            const int WA_ACTIVE = 1;
-            const int WA_CLICKACTIVE = 2;
-
-            switch (LoWord(wParam))
-            {
-                case WA_ACTIVE:
-                case WA_CLICKACTIVE:
-                    Attach();
-                    break;
-
-                case WA_INACTIVE:
-                    Detach();
-                    break;
-            }
-        }
-
-        private static int LoWord(IntPtr dw)
-        {
-            return unchecked((short)(uint)dw);
-        }
     }
 }

RetailCoder.VBE/Inspections/ImplicitActiveSheetReferenceInspection.cs

@@ -36,7 +36,9 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
             }
 
             var matches = BuiltInDeclarations.Where(item =>
-                Targets.Contains(item.IdentifierName)).ToList();
+                        Targets.Contains(item.IdentifierName) &&
+                        item.ParentScope == "EXCEL.EXE;Excel._Global" &&
+                        item.AsTypeName == "Range").ToList();
 
             var issues = matches.Where(item => item.References.Any())
                 .SelectMany(declaration => declaration.References);

RetailCoder.VBE/Inspections/Inspector.cs

@@ -24,7 +24,7 @@ public Inspector(IGeneralConfigService configService, IEnumerable<IInspection> i
                 _inspections = inspections;
 
                 _configService = configService;
-                configService.LanguageChanged += ConfigServiceLanguageChanged;
+                configService.SettingsChanged += ConfigServiceLanguageChanged;
             }
 
             private void ConfigServiceLanguageChanged(object sender, EventArgs e)
@@ -121,7 +121,7 @@ public void Dispose()
             {
                 if (_configService != null)
                 {
-                    _configService.LanguageChanged -= ConfigServiceLanguageChanged;
+                    _configService.SettingsChanged -= ConfigServiceLanguageChanged;
                 }
             }
         }

RetailCoder.VBE/Inspections/ParameterCanBeByValInspection.cs

@@ -44,7 +44,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                 .Concat(declarations.FindInterfaceImplementationMembers())
                 .ToList();
 
-            var formEventHandlerScopes = declarations.FindFormEventHandlers()
+            var formEventHandlerScopes = State.FindFormEventHandlers()
                 .Select(handler => handler.Scope);
 
             var eventScopes = declarations.Where(item =>

RetailCoder.VBE/Inspections/ProcedureCanBeWrittenAsFunctionInspection.cs

@@ -40,9 +40,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                 .Where(c =>
             {
                 var declaration =
-                    UserDeclarations.SingleOrDefault(d => d.DeclarationType == DeclarationType.Procedure &&
-                                                          d.IdentifierName == c.subroutineName().GetText() &&
-                                                          d.Context.GetSelection().Equals(c.GetSelection()));
+                    UserDeclarations.SingleOrDefault(d => d.Context == c);
 
                 if (UserDeclarations.FindInterfaceMembers().Contains(declaration))
                 {
@@ -63,9 +61,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
             var subStmtsNotImplementingEvents = subStmts
                 .Where(c =>
                 {
-                    var declaration = UserDeclarations.SingleOrDefault(d => d.DeclarationType == DeclarationType.Procedure &&
-                                                              d.IdentifierName == c.subroutineName().GetText() &&
-                                                              d.Context.GetSelection().Equals(c.GetSelection()));
+                    var declaration = UserDeclarations.SingleOrDefault(d => d.Context == c);
 
                     if (declaration == null) { return false; }  // rather be safe than sorry