Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into AddModuleCommand

# Conflicts:
#	Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs
#	Rubberduck.Core/Rubberduck.Core.csproj
#	Rubberduck.Core/UI/CodeExplorer/Commands/AddComponentCommand.cs
#	Rubberduck.Resources/CodeExplorer/CodeExplorerUI.Designer.cs
#	Rubberduck.Resources/CodeExplorer/CodeExplorerUI.resx

Author: bclothier

.gitignore

@@ -7,6 +7,7 @@
 *.sln.docstates
 *.csproj.user
 *.csproj.DotSettings
+launchSettings.json
 
 # External NuGet Packages
 [Pp]ackages/
@@ -178,4 +179,7 @@ $RECYCLE.BIN/
 Installers/
 *.xlsx
 
-CodeGraphData/
+CodeGraphData/
+/Rubberduck.Deployment/Properties/launchSettings.json
+/Rubberduck.Deployment/Rubberduck.API.idl
+/Rubberduck.Deployment/Rubberduck.idl

README.md

@@ -1,4 +1,4 @@
-<img src="https://user-images.githubusercontent.com/5751684/38372412-c3247d70-38bc-11e8-8eaa-2f2d19595a42.png" width=100% />
+<img src="https://user-images.githubusercontent.com/5751684/46327997-aeb98d00-c5d2-11e8-9de5-ba6f9cd1eea3.png" />
 
 <!-- campaign is no longer accepting donations
 ### Donate!
@@ -18,7 +18,7 @@ If you like this project and would like to thank its contributors, you are welco
 
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/rubberduck-vba/Rubberduck.svg)](http://isitmaintained.com/project/rubberduck-vba/Rubberduck "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/rubberduck-vba/Rubberduck.svg)](http://isitmaintained.com/project/rubberduck-vba/Rubberduck "Percentage of issues still open")
 
-> **[rubberduckvba.com](http://rubberduckvba.com)** [Wiki](https://github.com/retailcoder/Rubberduck/wiki) [Rubberduck News](https://rubberduckvba.wordpress.com/) 
+> **[rubberduckvba.com](http://rubberduckvba.com)** [Wiki](https://github.com/rubberduck-vba/Rubberduck/wiki) [Rubberduck News](https://rubberduckvba.wordpress.com/) 
 > devs@rubberduckvba.com  
 > Follow [@rubberduckvba](https://twitter.com/rubberduckvba) on Twitter 
 
@@ -29,15 +29,14 @@ If you like this project and would like to thank its contributors, you are welco
  * [Installing](https://github.com/rubberduck-vba/Rubberduck/wiki/Installing)
  * [Getting Started](https://github.com/rubberduck-vba/Rubberduck/blob/next/docs/GettingStarted.md) using Rubberduck
  * [Contributing](https://github.com/rubberduck-vba/Rubberduck/blob/next/CONTRIBUTING.md)
- * [User Testimonials](https://github.com/rubberduck-vba/Rubberduck/blob/next/thanks.md)
 
 ---
 
 ## License
 
 Rubberduck is a COM add-in for the VBA IDE (VBE).
 
-Copyright (C) 2014-2018 Mathieu Guindon & Christopher McClellan
+Copyright (C) 2014-2018 Rubberduck project contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Rubberduck.API/Properties/AssemblyInfo.cs

@@ -1,19 +1,7 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Rubberduck.Resources.Registration;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Rubberduck.API")]
-[assembly: AssemblyDescription("Rubberduck Reflection API")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Rubberduck-VBA")]
-[assembly: AssemblyProduct("Rubberduck.API")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyCulture("en")]
-[assembly: AssemblyTrademark("")]
 [assembly: InternalsVisibleTo("RubberduckTests")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
@@ -23,15 +11,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid(RubberduckGuid.RubberduckApiTypeLibGuid)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.*")]

Rubberduck.API/Rubberduck.API.csproj

@@ -1,82 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Sunburst.NET.Sdk.WPF/1.0.47">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Product>Rubberduck.API</Product>
+    <Description>Rubberduck Reflection API</Description>
+    <Copyright>Copyright © 2018</Copyright>
     <ProjectGuid>{AC1B4A57-364A-4F90-A0CD-6EE818349CE5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Rubberduck.API</RootNamespace>
-    <AssemblyName>Rubberduck.API</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <!-- 
+    TODO: affix AssemblyVersion and/or FileVersion for COM-Registration?!
+    -->
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="VBA\ApiProvider.cs" />
-    <Compile Include="VBA\Accessibility.cs" />
-    <Compile Include="VBA\Declaration.cs" />
-    <Compile Include="VBA\Declarations.cs" />
-    <Compile Include="VBA\DeclarationType.cs" />
-    <Compile Include="VBA\IdentifierReference.cs" />
-    <Compile Include="VBA\IdentifierReferences.cs" />
-    <Compile Include="VBA\Parser.cs" />
-    <Compile Include="VBA\ParserState.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Rubberduck.Core\Rubberduck.Core.csproj">
-      <Project>{a1587eac-7b54-407e-853f-4c7493d0323e}</Project>
-      <Name>Rubberduck.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Rubberduck.Main\Rubberduck.Main.csproj">
-      <Project>{E8AB5D93-2D0F-423D-BC15-5EE118673E48}</Project>
-      <Name>Rubberduck.Main</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Rubberduck.Parsing\Rubberduck.Parsing.csproj">
-      <Project>{a4a618e1-cbca-435f-9c6c-5181e030adfc}</Project>
-      <Name>Rubberduck.Parsing</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Rubberduck.Resources\Rubberduck.Resources.csproj">
-      <Project>{1b84b387-f7c4-4876-9bdf-c644c365359a}</Project>
-      <Name>Rubberduck.Resources</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj">
-      <Project>{8ce35eb3-8852-4ba1-84dd-df3f5d2967b0}</Project>
-      <Name>Rubberduck.VBEditor</Name>
-    </ProjectReference>
-  </ItemGroup>
+  <Import Project="..\RubberduckBaseProject.csproj" />
+
   <ItemGroup>
-    <Folder Include="Plugin\" />
+    <ProjectReference Include="..\Rubberduck.Core\Rubberduck.Core.csproj" />
+    <ProjectReference Include="..\Rubberduck.Main\Rubberduck.Main.csproj" />
+    <ProjectReference Include="..\Rubberduck.Parsing\Rubberduck.Parsing.csproj" />
+    <ProjectReference Include="..\Rubberduck.Resources\Rubberduck.Resources.csproj" />
+    <ProjectReference Include="..\Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\RubberduckCodeAnalysis\bin\Release\RubberduckCodeAnalysis.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Rubberduck.API/VBA/Parser.cs

@@ -4,18 +4,27 @@
 using System.Globalization;
 using System.Linq;
 using System.Runtime.InteropServices;
-using Rubberduck.Common;
+using System.Threading;
+using Rubberduck.Parsing.ComReflection;
 using Rubberduck.Parsing.PreProcessing;
+using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols.DeclarationLoaders;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.UIContext;
+using Rubberduck.Parsing.VBA.ComReferenceLoading;
+using Rubberduck.Parsing.VBA.DeclarationCaching;
+using Rubberduck.Parsing.VBA.DeclarationResolving;
+using Rubberduck.Parsing.VBA.Parsing;
+using Rubberduck.Parsing.VBA.Parsing.ParsingExceptions;
+using Rubberduck.Parsing.VBA.ReferenceManagement;
 using Rubberduck.Resources.Registration;
 using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.Events;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.Utility;
 using Rubberduck.Root;
+using Rubberduck.VBEditor.ComManagement.TypeLibs;
+using Rubberduck.VBEditor.SourceCodeHandling;
 
 namespace Rubberduck.API.VBA
 {
@@ -59,16 +68,17 @@ public interface IParserEvents
     public sealed class Parser : IParser, IDisposable
     {
         private RubberduckParserState _state;
-        private AttributeParser _attributeParser;
-        private ParseCoordinator _parser;
+        private SynchronousParseCoordinator _parser;
         private IVBE _vbe;
         private IVBEEvents _vbeEvents;
         private readonly IUiDispatcher _dispatcher;
+        private readonly CancellationTokenSource _tokenSource;
 
         internal Parser()
         {
             UiContextProvider.Initialize();
             _dispatcher = new UiDispatcher(UiContextProvider.Instance());
+            _tokenSource = new CancellationTokenSource();
         }
 
         // vbe is the com coclass interface from the interop assembly.
@@ -86,17 +96,26 @@ internal Parser(object vbe) : this()
             var projectRepository = new ProjectsRepository(_vbe);
             _state = new RubberduckParserState(_vbe, projectRepository, declarationFinderFactory, _vbeEvents);
             _state.StateChanged += _state_StateChanged;
-
-            var sourceCodeHandler = _vbe.SourceCodeHandler;
-
-            IVBAPreprocessor preprocessorFactory() => new VBAPreprocessor(double.Parse(_vbe.Version, CultureInfo.InvariantCulture));
-            _attributeParser = new AttributeParser(sourceCodeHandler, preprocessorFactory, _state.ProjectsProvider);
+            var vbeVersion = double.Parse(_vbe.Version, CultureInfo.InvariantCulture);
+            var predefinedCompilationConstants = new VBAPredefinedCompilationConstants(vbeVersion);
+            var typeLibProvider = new TypeLibWrapperProvider(projectRepository);
+            var compilationArgumentsProvider = new CompilationArgumentsProvider(typeLibProvider, _dispatcher, predefinedCompilationConstants);
+            var compilationsArgumentsCache = new CompilationArgumentsCache(compilationArgumentsProvider);
+            var preprocessorErrorListenerFactory = new PreprocessingParseErrorListenerFactory();
+            var preprocessorParser = new VBAPreprocessorParser(preprocessorErrorListenerFactory, preprocessorErrorListenerFactory);
+            var preprocessor = new VBAPreprocessor(preprocessorParser, compilationsArgumentsCache);
+            var mainParseErrorListenerFactory = new MainParseErrorListenerFactory();
+            var mainTokenStreamParser = new VBATokenStreamParser(mainParseErrorListenerFactory, mainParseErrorListenerFactory);
+            var tokenStreamProvider = new SimpleVBAModuleTokenStreamProvider();
+            var stringParser = new TokenStreamParserStringParserAdapterWithPreprocessing(tokenStreamProvider, mainTokenStreamParser, preprocessor);
             var projectManager = new RepositoryProjectManager(projectRepository);
             var moduleToModuleReferenceManager = new ModuleToModuleReferenceManager();
             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>
@@ -108,12 +127,17 @@ internal Parser(object vbe) : this()
                         //new RubberduckApiDeclarations(_state)
                     }
                 );
+            var codePaneSourceCodeHandler = new CodePaneSourceCodeHandler(projectRepository);
+            var sourceFileHandler = _vbe.TempSourceFileHandler;
+            var attributesSourceCodeHandler = new SourceFileHandlerSourceCodeHandlerAdapter(sourceFileHandler, projectRepository);
+            var moduleParser = new ModuleParser(
+                codePaneSourceCodeHandler,
+                attributesSourceCodeHandler,
+                stringParser);
             var parseRunner = new ParseRunner(
                 _state,
                 parserStateManager,
-                preprocessorFactory,
-                _attributeParser, 
-                sourceCodeHandler);
+                moduleParser);
             var declarationResolveRunner = new DeclarationResolveRunner(
                 _state, 
                 parserStateManager, 
@@ -134,25 +158,25 @@ internal Parser(object vbe) : this()
                 _state,
                 moduleToModuleReferenceManager,
                 referenceRemover,
-                supertypeClearer
+                supertypeClearer,
+                compilationsArgumentsCache
                 );
 
-            _parser = new ParseCoordinator(
+            _parser = new SynchronousParseCoordinator(
                 _state,
                 parsingStageService,
                 parsingCacheService,
                 projectManager,
                 parserStateManager
                 );
         }
-
+        
         /// <summary>
         /// Blocking call, for easier unit-test code
         /// </summary>
         public void Parse()
         {
-            // blocking call
-            _parser.Parse(new System.Threading.CancellationTokenSource());
+            _parser.Parse(_tokenSource);
         }
 
         /// <summary>
@@ -163,7 +187,7 @@ public void BeginParse()
             // non-blocking call
             _dispatcher.Invoke(() => _state.OnParseRequested(this));
         }
-
+        
         public delegate void OnStateChangedDelegate(ParserState ParserState);
         public event OnStateChangedDelegate OnStateChanged;
 

Rubberduck.CodeAnalysis/CodeMetrics/CodeMetricBase.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.VBA.DeclarationCaching;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.CodeAnalysis.CodeMetrics

Rubberduck.CodeAnalysis/CodeMetrics/CodeMetricsAnalyst.cs

@@ -4,6 +4,7 @@
 using Rubberduck.VBEditor;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.Parsing.VBA.DeclarationCaching;
 
 namespace Rubberduck.CodeAnalysis.CodeMetrics
 {