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

Author: SonGokussj4

README.md

@@ -37,7 +37,7 @@ If you like this project and would like to thank its contributors, you are welco
 
 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/VBA/Parser.cs

@@ -4,18 +4,27 @@
 using System.Globalization;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Threading;
 using Rubberduck.Common;
 using Rubberduck.Parsing.PreProcessing;
+using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols.DeclarationLoaders;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.Parsing.Symbols.ParsingExceptions;
 using Rubberduck.Parsing.UIContext;
+using Rubberduck.Parsing.VBA.ComReferenceLoading;
+using Rubberduck.Parsing.VBA.DeclarationResolving;
+using Rubberduck.Parsing.VBA.Parsing;
+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.
@@ -87,10 +97,20 @@ internal Parser(object vbe) : this()
             _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 sourceFileHandler = _vbe.SourceFileHandler;
+            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 attributesSourceCodeHandler = new SourceFileHandlerSourceCodeHandlerAdapter(sourceFileHandler, projectRepository);
             var projectManager = new RepositoryProjectManager(projectRepository);
             var moduleToModuleReferenceManager = new ModuleToModuleReferenceManager();
             var parserStateManager = new ParserStateManager(_state);
@@ -108,12 +128,19 @@ internal Parser(object vbe) : this()
                         //new RubberduckApiDeclarations(_state)
                     }
                 );
+            var codePaneSourceCodeHandler = new CodePaneSourceCodeHandler(projectRepository);
+            var moduleRewriterFactory = new ModuleRewriterFactory(
+                codePaneSourceCodeHandler,
+                attributesSourceCodeHandler);
+            var moduleParser = new ModuleParser(
+                codePaneSourceCodeHandler,
+                attributesSourceCodeHandler,
+                stringParser,
+                moduleRewriterFactory);
             var parseRunner = new ParseRunner(
                 _state,
                 parserStateManager,
-                preprocessorFactory,
-                _attributeParser, 
-                sourceCodeHandler);
+                moduleParser);
             var declarationResolveRunner = new DeclarationResolveRunner(
                 _state, 
                 parserStateManager, 
@@ -134,25 +161,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 +190,7 @@ public void BeginParse()
             // non-blocking call
             _dispatcher.Invoke(() => _state.OnParseRequested(this));
         }
-
+        
         public delegate void OnStateChangedDelegate(ParserState ParserState);
         public event OnStateChangedDelegate OnStateChanged;
 

Rubberduck.CodeAnalysis/Inspections/Abstract/ParseTreeInspectionBase.cs

@@ -1,5 +1,6 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Parsing.VBA.Parsing;
 
 namespace Rubberduck.Inspections.Abstract
 {
@@ -9,6 +10,6 @@ protected ParseTreeInspectionBase(RubberduckParserState state)
             : base(state) { }
 
         public abstract IInspectionListener Listener { get; }
-        public virtual ParsePass Pass => ParsePass.CodePanePass;
+        public virtual CodeKind TargetKindOfCode => CodeKind.CodePaneCode;
     }
 }

Rubberduck.CodeAnalysis/Inspections/Abstract/QuickFixBase.cs

@@ -4,6 +4,7 @@
 using NLog;
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Parsing.VBA.Extensions;
 
 namespace Rubberduck.Inspections.Abstract
 {

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyModuleInspection.cs

@@ -7,6 +7,7 @@
 using Rubberduck.Resources.Inspections;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Parsing.VBA.Extensions;
 using Rubberduck.VBEditor.SafeComWrappers;
 
 namespace Rubberduck.Inspections.Concrete

Rubberduck.CodeAnalysis/Inspections/Concrete/ImplicitByRefModifierInspection.cs

@@ -9,6 +9,7 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Resources.Inspections;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Parsing.VBA.Extensions;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Inspections.Concrete

Rubberduck.CodeAnalysis/Inspections/Concrete/IntegerDataTypeInspection.cs

@@ -8,6 +8,7 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Parsing.VBA.Extensions;
 using Rubberduck.Resources;
 
 namespace Rubberduck.Inspections.Concrete

Rubberduck.CodeAnalysis/Inspections/Concrete/MissingAnnotationArgumentInspection.cs

@@ -9,6 +9,7 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Resources.Inspections;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Parsing.VBA.Parsing;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Inspections.Concrete
@@ -18,7 +19,7 @@ public sealed class MissingAnnotationArgumentInspection : ParseTreeInspectionBas
         public MissingAnnotationArgumentInspection(RubberduckParserState state)
             : base(state) { }
 
-        public override ParsePass Pass => ParsePass.AttributesPass;
+        public override CodeKind TargetKindOfCode => CodeKind.AttributesCode;
 
         public override IInspectionListener Listener { get; } =
             new InvalidAnnotationStatementListener();

Rubberduck.CodeAnalysis/Inspections/Concrete/MissingAttributeInspection.cs

@@ -11,6 +11,7 @@
 using Rubberduck.Resources.Inspections;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Parsing.VBA.Parsing;
 
 namespace Rubberduck.Inspections.Concrete
 {
@@ -23,7 +24,7 @@ public MissingAttributeInspection(RubberduckParserState state)
             Listener = new MissingMemberAttributeListener(state);
         }
 
-        public override ParsePass Pass => ParsePass.AttributesPass;
+        public override CodeKind TargetKindOfCode => CodeKind.AttributesCode;
 
         public override IInspectionListener Listener { get; }
 

Rubberduck.CodeAnalysis/Inspections/Concrete/MultilineParameterInspection.cs

@@ -30,7 +30,7 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
                 .Select(context => new QualifiedContextInspectionResult(this,
                                                   string.Format(context.Context.GetSelection().LineCount > 3
                                                         ? RubberduckUI.EasterEgg_Continuator
-                                                        : Resources.Inspections.InspectionResults.MultilineParameterInspection, ((VBAParser.ArgContext)context.Context).unrestrictedIdentifier().ToString()),
+                                                        : Resources.Inspections.InspectionResults.MultilineParameterInspection, ((VBAParser.ArgContext)context.Context).unrestrictedIdentifier().GetText()),
                                                   context));
         }