Merge pull request #2000 from rubberduck-vba/next

Release 2.0.5

Author: Hosch250

README.md

@@ -105,13 +105,6 @@ This beautiful suite of professional-grade icons packs over 3,570 icons (16x16).
 These icons are licensed under a [Creative Commons Attribution 3.0 License](http://creativecommons.org/licenses/by/3.0/).
 If you can't or don't want to provide attribution, please [purchase a royalty-free license](http://p.yusukekamiyamane.com/).
 
-###[Microsoft Visual Studio Image Library](http://www.microsoft.com/en-ca/download/details.aspx?id=35825)
+###[SharpDevelop](https://github.com/icsharpcode/SharpDevelop.git)
 
-Icons in the `./Resources/Microsoft/` directory are licensed under Microsoft's Software License Terms, must be used accordingly with their meaning / file name.
-
-> You have a right to Use and Distribute these files. This means that you are free to copy and use these images in documents and projects that you create, but you may not modify them in anyway.
-
-For more information, please see the EULAs in the [./Resources/Microsoft/ directory](https://github.com/retailcoder/Rubberduck/tree/master/RetailCoder.VBE/Resources/Microsoft).
-
- * [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)
+Icons in the `./Resources/Custom/` directory were created by (or modified using elements from) the SharpDevelop icon set licensed under the [MIT license](https://opensource.org/licenses/MIT).

RetailCoder.VBE/API/ParserState.cs

@@ -68,8 +68,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,
-                new List<ICustomDeclarationLoader> { new DebugDeclarations(_state), new FormEventDeclarations(_state) });
+            _parser = new RubberduckParser(_state, _attributeParser, preprocessorFactory,
+                new List<ICustomDeclarationLoader> { new DebugDeclarations(_state), new FormEventDeclarations(_state), new AliasDeclarations(_state) });
         }
 
         /// <summary>
@@ -78,7 +78,7 @@ public void Initialize(VBE vbe)
         public void Parse()
         {
             // blocking call
-            _parser.Parse();
+            _parser.Parse(new System.Threading.CancellationTokenSource());
         }
 
         /// <summary>

RetailCoder.VBE/App.cs

@@ -11,7 +11,6 @@
 using Rubberduck.UI.Command.MenuItems;
 using System;
 using System.Globalization;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Rubberduck
@@ -141,8 +140,12 @@ public void Startup()
             _appMenus.Initialize();
             _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
             _appMenus.Localize();
-            Task.Delay(1000).ContinueWith(t => UiDispatcher.Invoke(() => _parser.State.OnParseRequested(this)));
             UpdateLoggingLevel();
+
+            if (_vbe.VBProjects.Count != 0)
+            {
+                _parser.State.OnParseRequested(this);
+            }
         }
 
         public void Shutdown()
@@ -157,168 +160,6 @@ public void Shutdown()
             }
         }
 
-        /*#region sink handlers.
-        async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
-            {
-                Logger.Debug("Locked project '{0}' was removed.", e.Item.Name);
-                return;
-            }
-
-            _parser.Cancel();
-
-            var projectId = e.Item.HelpFile;
-            Debug.Assert(projectId != null);
-
-            _parser.State.RemoveProject(e.Item);
-            _parser.State.OnParseRequested(this);
-        }
-
-        async void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            Logger.Debug("Project '{0}' was added.", e.Item.Name);
-            if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
-            {
-                Logger.Debug("Project is protected and will not be added to parser state.");
-                return;
-            }
-
-            _parser.State.AddProject(e.Item); // note side-effect: assigns ProjectId/HelpFile
-            var projectId = e.Item.HelpFile;
-            RegisterComponentsEventSink(e.Item.VBComponents, projectId);
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                // forces menus to evaluate their CanExecute state:
-                Parser_StateChanged(this, new ParserStateEventArgs(ParserState.Pending));
-                _stateBar.SetStatusText();
-                return;
-            }
-
-            _parser.State.OnParseRequested(sender);
-        }
-
-        async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-        }
-
-        async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel();
-
-            _sourceControlPanelVM.HandleRenamedComponent(e.Item, e.OldName);
-
-            Logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
-            
-            var projectId = e.Item.Collection.Parent.HelpFile;
-            var componentDeclaration = _parser.State.AllDeclarations.FirstOrDefault(f =>
-                        f.ProjectId == projectId &&
-                        f.DeclarationType == DeclarationType.ClassModule &&
-                        f.IdentifierName == e.OldName);
-
-            if (e.Item.Type == vbext_ComponentType.vbext_ct_Document &&
-                componentDeclaration != null &&
-
-                // according to ThunderFrame, Excel is the only one we explicitly support
-                // with two Document-component types just skip the Worksheet component
-                ((ClassModuleDeclaration) componentDeclaration).Supertypes.All(a => a.IdentifierName != "Worksheet"))
-            {
-                _parser.State.RemoveProject(projectId);
-
-                _parser.State.AddProject(e.Item.Collection.Parent);
-            }
-            else
-            {
-                _parser.State.RemoveRenamedComponent(e.Item, e.OldName);
-            }
-
-            _parser.State.OnParseRequested(this);
-        }
-
-        async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel(e.Item);
-
-            _sourceControlPanelVM.HandleRemovedComponent(e.Item);
-
-            Logger.Debug("Component '{0}' was removed.", e.Item.Name);
-            _parser.State.ClearStateCache(e.Item, true);
-        }
-
-        async void sink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel(e.Item);
-            
-            _parser.State.OnParseRequested(sender, e.Item);
-        }
-
-        async void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _sourceControlPanelVM.HandleAddedComponent(e.Item);
-
-            Logger.Debug("Component '{0}' was added.", e.Item.Name);
-            _parser.State.OnParseRequested(sender, e.Item);
-        }
-
-        async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProject> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel();
-
-            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.AddProject(e.Item);
-
-            _parser.State.OnParseRequested(sender);
-        }
-        #endregion*/
-
         private void _stateBar_Refresh(object sender, EventArgs e)
         {
             // handles "refresh" button click on "Rubberduck" command bar

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -456,9 +456,9 @@ public static Declaration FindInterfaceMember(this IEnumerable<Declaration> decl
             var members = FindInterfaceMembers(declarations);
             var matches = members.Where(m => !m.IsBuiltIn && implementation.IdentifierName == m.ComponentName + '_' + m.IdentifierName).ToList();
 
-            return matches.Count > 1 
-                ? matches.SingleOrDefault(m => m.ProjectId == implementation.ProjectId) 
-                : matches.First();
+            return matches.Count > 1
+                ? matches.SingleOrDefault(m => m.ProjectId == implementation.ProjectId)
+                : matches.FirstOrDefault();
         }
 
         public static Declaration FindTarget(this IEnumerable<Declaration> declarations, QualifiedSelection selection)