Merge remote-tracking branch 'upstream/next' into rkapka-master

# Conflicts:
#	RubberduckTests/RubberduckTests.csproj

Author: rkapka

Rubberduck.API/VBA/Parser.cs

@@ -6,6 +6,7 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using Rubberduck.Common;
+using Rubberduck.Parsing.ComReflection;
 using Rubberduck.Parsing.PreProcessing;
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols.DeclarationLoaders;
@@ -116,7 +117,9 @@ internal Parser(object vbe) : this()
             var parserStateManager = new ParserStateManager(_state);
             var referenceRemover = new ReferenceRemover(_state, moduleToModuleReferenceManager);
             var supertypeClearer = new SupertypeClearer(_state);
-            var comSynchronizer = new COMReferenceSynchronizer(_state, parserStateManager);
+            var comLibraryProvider = new ComLibraryProvider();
+            var referencedDeclarationsCollector = new LibraryReferencedDeclarationsCollector(comLibraryProvider);
+            var comSynchronizer = new COMReferenceSynchronizer(_state, parserStateManager, projectRepository, referencedDeclarationsCollector);
             var builtInDeclarationLoader = new BuiltInDeclarationLoader(
                 _state,
                 new List<ICustomDeclarationLoader>

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyModuleInspection.cs

@@ -87,7 +87,7 @@ public override bool VisitModuleDeclarations(VBAParser.ModuleDeclarationsContext
 
         public override bool VisitModuleDeclarationsElement(VBAParser.ModuleDeclarationsElementContext context)
         {
-            return context.variableStmt() == null
+            return context.moduleVariableStmt() == null
                    && context.constStmt() == null
                    && context.enumerationStmt() == null
                    && context.udtDeclaration() == null

Rubberduck.CodeAnalysis/Inspections/Concrete/ModuleScopeDimKeywordInspection.cs

@@ -45,7 +45,7 @@ public void ClearContexts()
 
             public override void ExitVariableStmt([NotNull] VBAParser.VariableStmtContext context)
             {
-                if (context.DIM() != null && context.Parent is VBAParser.ModuleDeclarationsElementContext)
+                if (context.DIM() != null && context.TryGetAncestor<VBAParser.ModuleDeclarationsElementContext>(out _))
                 {
                     _contexts.Add(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context));
                 }

Rubberduck.Core/App.cs

@@ -116,13 +116,13 @@ public void Startup()
 
             CheckForLegacyIndenterSettings();
             _appMenus.Initialize();
-            _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
+            _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts            
             _appMenus.Localize();
 
             if (_config.UserSettings.GeneralSettings.CanCheckVersion)
             {
                 _checkVersionCommand.Execute(null);
-            }
+            }            
         }
 
         public void Shutdown()

Rubberduck.Core/AppMenu.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using NLog;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.VBA;
@@ -63,6 +62,7 @@ public void Localize()
         {
             _stateBar.Localize();
             _stateBar.SetStatusLabelCaption(_parser.State.Status);
+
             foreach (var menu in _menus)
             {
                 menu.Localize();

Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerComponentViewModel.cs

@@ -164,6 +164,7 @@ public bool IsTestModule
             { ComponentType.VBForm, DeclarationType.VbForm },
             { ComponentType.MDIForm, DeclarationType.MdiForm},
             { ComponentType.UserControl, DeclarationType.UserControl},
+            { ComponentType.DocObject, DeclarationType.DocObject},
             { ComponentType.ResFile, DeclarationType.ResFile},
             { ComponentType.RelatedDocument, DeclarationType.RelatedDocument},
             { ComponentType.PropPage, DeclarationType.PropPage},

Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -19,6 +19,7 @@
 using Rubberduck.VBEditor.SafeComWrappers;
 using System.Windows;
 using Rubberduck.Parsing.UIContext;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 // ReSharper disable CanBeReplacedWithTryCastAndCheckForNull
 // ReSharper disable ExplicitCallerInfoArgument
@@ -33,6 +34,7 @@ public sealed class CodeExplorerViewModel : ViewModelBase, IDisposable
         private readonly GeneralSettings _generalSettings;
         private readonly WindowSettings _windowSettings;
         private readonly IUiDispatcher _uiDispatcher;
+        private readonly VBEKind _vbeKind;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
@@ -42,14 +44,16 @@ public CodeExplorerViewModel(
             List<CommandBase> commands,
             IConfigProvider<GeneralSettings> generalSettingsProvider, 
             IConfigProvider<WindowSettings> windowSettingsProvider, 
-            IUiDispatcher uiDispatcher)
+            IUiDispatcher uiDispatcher,
+            IVBE vbe)
         {
             _folderHelper = folderHelper;
             _state = state;
             _state.StateChanged += HandleStateChanged;
             _state.ModuleStateChanged += ParserState_ModuleStateChanged;
             _windowSettingsProvider = windowSettingsProvider;
             _uiDispatcher = uiDispatcher;
+            _vbeKind = vbe.Kind;
 
             if (generalSettingsProvider != null)
             {
@@ -68,15 +72,19 @@ public CodeExplorerViewModel(
                 o => reparseCommand.Execute(o),
                 o => !IsBusy && reparseCommand != null && reparseCommand.CanExecute(o));
 
-            OpenCommand = commands.OfType<UI.CodeExplorer.Commands.OpenCommand>().SingleOrDefault();
+            OpenCommand = commands.OfType<OpenCommand>().SingleOrDefault();
             OpenDesignerCommand = commands.OfType<OpenDesignerCommand>().SingleOrDefault();
 
-            AddTestModuleCommand = commands.OfType<UI.CodeExplorer.Commands.AddTestModuleCommand>().SingleOrDefault();
-            AddTestModuleWithStubsCommand = commands.OfType<AddTestModuleWithStubsCommand>().SingleOrDefault();
-
+            AddVBFormCommand = commands.OfType<AddVBFormCommand>().SingleOrDefault();
+            AddMDIFormCommand = commands.OfType<AddMDIFormCommand>().SingleOrDefault();
+            AddUserFormCommand = commands.OfType<AddUserFormCommand>().SingleOrDefault();
             AddStdModuleCommand = commands.OfType<AddStdModuleCommand>().SingleOrDefault();
             AddClassModuleCommand = commands.OfType<AddClassModuleCommand>().SingleOrDefault();
-            AddUserFormCommand = commands.OfType<AddUserFormCommand>().SingleOrDefault();
+            AddUserControlCommand = commands.OfType<AddUserControlCommand>().SingleOrDefault();
+            AddPropertyPageCommand = commands.OfType<AddPropertyPageCommand>().SingleOrDefault();
+            AddUserDocumentCommand = commands.OfType<AddUserDocumentCommand>().SingleOrDefault();
+            AddTestModuleCommand = commands.OfType<UI.CodeExplorer.Commands.AddTestModuleCommand>().SingleOrDefault();
+            AddTestModuleWithStubsCommand = commands.OfType<AddTestModuleWithStubsCommand>().SingleOrDefault();            
 
             OpenProjectPropertiesCommand = commands.OfType<OpenProjectPropertiesCommand>().SingleOrDefault();
             RenameCommand = commands.OfType<RenameCommand>().SingleOrDefault();
@@ -90,7 +98,7 @@ public CodeExplorerViewModel(
 
             ImportCommand = commands.OfType<ImportCommand>().SingleOrDefault();
             ExportCommand = commands.OfType<ExportCommand>().SingleOrDefault();
-            ExportAllCommand = commands.OfType<Rubberduck.UI.Command.ExportAllCommand>().SingleOrDefault();
+            ExportAllCommand = commands.OfType<ExportAllCommand>().SingleOrDefault();
 
             _externalRemoveCommand = commands.OfType<RemoveCommand>().SingleOrDefault();
             if (_externalRemoveCommand != null)
@@ -511,11 +519,17 @@ private void SwitchNodeState(CodeExplorerItemViewModel node, bool expandedState)
 
         public CommandBase OpenCommand { get; }
 
+
+        public CommandBase AddVBFormCommand { get; }
+        public CommandBase AddMDIFormCommand { get; }
+        public CommandBase AddUserFormCommand { get; }
+        public CommandBase AddStdModuleCommand { get; }
+        public CommandBase AddClassModuleCommand { get; }                
+        public CommandBase AddUserControlCommand { get; }
+        public CommandBase AddPropertyPageCommand { get; }
+        public CommandBase AddUserDocumentCommand { get; }
         public CommandBase AddTestModuleCommand { get; }
         public CommandBase AddTestModuleWithStubsCommand { get; }
-        public CommandBase AddStdModuleCommand { get; }
-        public CommandBase AddClassModuleCommand { get; }
-        public CommandBase AddUserFormCommand { get; }
 
         public CommandBase OpenDesignerCommand { get; }
         public CommandBase OpenProjectPropertiesCommand { get; }
@@ -552,14 +566,18 @@ private void ExecuteRemoveComand(object param)
 
         private bool CanExecuteExportAllCommand => ExportAllCommand.CanExecute(SelectedItem);
 
-        public Visibility ExportVisibility => CanExecuteExportAllCommand ? Visibility.Collapsed : Visibility.Visible;
+        public Visibility ExportVisibility => _vbeKind == VBEKind.Standalone || CanExecuteExportAllCommand ? Visibility.Collapsed : Visibility.Visible;
 
         public Visibility ExportAllVisibility => CanExecuteExportAllCommand ? Visibility.Visible : Visibility.Collapsed;
 
         public Visibility TreeViewVisibility => Projects == null || Projects.Count == 0 ? Visibility.Collapsed : Visibility.Visible;
 
         public Visibility EmptyUIRefreshMessageVisibility => _isBusy ? Visibility.Hidden : Visibility.Visible;
 
+        public Visibility VB6Visibility => _vbeKind == VBEKind.Standalone ? Visibility.Visible : Visibility.Collapsed;
+
+        public Visibility VBAVisibility => _vbeKind == VBEKind.Hosted ? Visibility.Visible : Visibility.Collapsed;
+
         public void FilterByName(IEnumerable<CodeExplorerItemViewModel> nodes, string searchString)
         {
             foreach (var item in nodes)

Rubberduck.Core/Rubberduck.Core.csproj

@@ -382,6 +382,11 @@
     <Compile Include="AutoComplete\AutoCompleteClosingParenthese.cs" />
     <Compile Include="AutoComplete\AutoCompleteClosingString.cs" />
     <Compile Include="AutoComplete\AutoCompleteService.cs" />
+    <Compile Include="UI\CodeExplorer\Commands\AddPropertyPageCommand.cs" />
+    <Compile Include="UI\CodeExplorer\Commands\AddUserDocumentCommand.cs" />
+    <Compile Include="UI\CodeExplorer\Commands\AddUserControlCommand.cs" />
+    <Compile Include="UI\CodeExplorer\Commands\AddMDIFormCommand.cs" />
+    <Compile Include="UI\CodeExplorer\Commands\AddVBFormCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\AddTestModuleWithStubsCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\CodeExplorerCommandAttribute.cs" />
     <Compile Include="UI\CodeExplorer\Commands\AddUserFormCommand.cs" />