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

Author: rkapka

Rubberduck.API/VBA/Parser.cs

@@ -7,16 +7,24 @@
 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
 {
@@ -60,7 +68,6 @@ public interface IParserEvents
     public sealed class Parser : IParser, IDisposable
     {
         private RubberduckParserState _state;
-        private AttributeParser _attributeParser;
         private SynchronousParseCoordinator _parser;
         private IVBE _vbe;
         private IVBEEvents _vbeEvents;
@@ -90,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.TempSourceFileHandler;
+            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);
@@ -111,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, 
@@ -137,7 +161,8 @@ internal Parser(object vbe) : this()
                 _state,
                 moduleToModuleReferenceManager,
                 referenceRemover,
-                supertypeClearer
+                supertypeClearer,
+                compilationsArgumentsCache
                 );
 
             _parser = new SynchronousParseCoordinator(

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/ObsoleteCallStatementInspection.cs

@@ -8,6 +8,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/ObsoleteCallingConventionInspection.cs

@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using System.Linq;
+using Antlr4.Runtime;
+using Rubberduck.Inspections.Abstract;
+using Rubberduck.Inspections.Results;
+using Rubberduck.Parsing;
+using Rubberduck.Parsing.Grammar;
+using Rubberduck.Parsing.Inspections.Abstract;
+using Rubberduck.Parsing.VBA;
+using Rubberduck.Resources.Inspections;
+using Rubberduck.VBEditor;
+
+namespace Rubberduck.Inspections.Inspections.Concrete
+{
+    public sealed class ObsoleteCallingConventionInspection : ParseTreeInspectionBase
+    {
+        public ObsoleteCallingConventionInspection(RubberduckParserState state)
+            : base(state)
+        {
+            Listener = new ObsoleteCallingConventionListener();
+        }
+
+        public override IInspectionListener Listener { get; }
+
+        protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
+        {
+            return Listener.Contexts
+                .Where(context => ((VBAParser.DeclareStmtContext) context.Context).CDECL() != null &&
+                    !IsIgnoringInspectionResultFor(context.ModuleName, context.Context.Start.Line))
+                .Select(context => new QualifiedContextInspectionResult(this,
+                    string.Format(InspectionResults.ObsoleteCallingConventionInspection,
+                        ((VBAParser.DeclareStmtContext) context.Context).identifier().GetText()), context));
+        }
+
+        public class ObsoleteCallingConventionListener : VBAParserBaseListener, IInspectionListener
+        {
+            private readonly List<QualifiedContext<ParserRuleContext>> _contexts = new List<QualifiedContext<ParserRuleContext>>();
+            public IReadOnlyList<QualifiedContext<ParserRuleContext>> Contexts => _contexts;
+
+            public QualifiedModuleName CurrentModuleName { get; set; }
+
+            public void ClearContexts()
+            {
+                _contexts.Clear();
+            }
+
+            public override void ExitDeclareStmt(VBAParser.DeclareStmtContext context)
+            {
+                _contexts.Add(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context));
+                base.ExitDeclareStmt(context);
+            }
+        }
+    }
+}