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

Author: SonGokussj4

Rubberduck.API/VBA/Parser.cs

@@ -97,7 +97,7 @@ internal Parser(object vbe) : this()
             _state = new RubberduckParserState(_vbe, projectRepository, declarationFinderFactory, _vbeEvents);
             _state.StateChanged += _state_StateChanged;
 
-            var sourceFileHandler = _vbe.SourceFileHandler;
+            var sourceFileHandler = _vbe.TempSourceFileHandler;
             var vbeVersion = double.Parse(_vbe.Version, CultureInfo.InvariantCulture);
             var predefinedCompilationConstants = new VBAPredefinedCompilationConstants(vbeVersion);
             var typeLibProvider = new TypeLibWrapperProvider(projectRepository);

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);
+            }
+        }
+    }
+}

Rubberduck.CodeAnalysis/Rubberduck.CodeAnalysis.csproj

@@ -79,6 +79,7 @@
     <Compile Include="Inspections\Concrete\EmptyForLoopBlockInspection.cs" />
     <Compile Include="Inspections\Concrete\BooleanAssignedInIfElseInspection.cs" />
     <Compile Include="Inspections\Concrete\EmptyWhileWendBlockInspection.cs" />
+    <Compile Include="Inspections\Concrete\ObsoleteCallingConventionInspection.cs" />
     <Compile Include="Inspections\Concrete\ObsoleteErrorSyntaxInspection.cs" />
     <Compile Include="Inspections\Concrete\ObsoleteMemberUsageInspection.cs" />
     <Compile Include="Inspections\Concrete\SheetAccessedUsingStringInspection.cs" />

Rubberduck.Core/Properties/Settings.Designer.cs

@@ -277,6 +277,7 @@
     <CodeInspection Name="StepOneIsRedundantInspection" Severity="Hint" InspectionType="LanguageOpportunities" />
     <CodeInspection Name="SheetAccessedUsingStringInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" />
     <CodeInspection Name="ObsoleteMemberUsageInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" />
+    <CodeInspection Name="ObsoleteCallingConventionInspection" Severity="Warning" InspectionType="CodeQualityIssues" />
   </CodeInspections>
   <WhitelistedIdentifiers />
   <RunInspectionsOnSuccessfulParse>true</RunInspectionsOnSuccessfulParse>

Rubberduck.Core/Properties/Settings.settings

@@ -398,6 +398,8 @@
                 InspectionType="LanguageOpportunities" />
               <CodeInspection Name="ObsoleteMemberUsageInspection" Severity="Warning"
                 InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="ObsoleteCallingConventionInspection" Severity="Warning"
+                InspectionType="CodeQualityIssues" />
             </CodeInspections>
             <WhitelistedIdentifiers />
             <RunInspectionsOnSuccessfulParse>true</RunInspectionsOnSuccessfulParse>

Rubberduck.Core/app.config

@@ -886,7 +886,7 @@ private void RegisterConstantVbeAndAddIn(IWindsorContainer container)
             container.Register(Component.For<ICommandBars>().Instance(_vbe.CommandBars));
             container.Register(Component.For<IUiContextProvider>().Instance(UiContextProvider.Instance()).LifestyleSingleton());
             container.Register(Component.For<IVBEEvents>().Instance(VBEEvents.Initialize(_vbe)).LifestyleSingleton());
-            container.Register(Component.For<ISourceFileHandler>().Instance(_vbe.SourceFileHandler));
+            container.Register(Component.For<ITempSourceFileHandler>().Instance(_vbe.TempSourceFileHandler));
         }
 
         private void RegisterHotkeyFactory(IWindsorContainer container)

Rubberduck.Main/Root/RubberduckIoCInstaller.cs

@@ -80,6 +80,7 @@ BYREF : B Y R E F;
 BYTE : B Y T E;
 CALL : C A L L;
 CASE : C A S E;
+CDECL : C D E C L;
 CLASS : C L A S S;
 CLOSE : C L O S E;
 CONST : C O N S T;

Rubberduck.Parsing/Grammar/VBALexer.g4

@@ -297,7 +297,7 @@ variable : expression;
 constStmt : (visibility whiteSpace)? CONST whiteSpace constSubStmt (whiteSpace? COMMA whiteSpace? constSubStmt)*;
 constSubStmt : identifier (whiteSpace asTypeClause)? whiteSpace? EQ whiteSpace? expression;
 
-declareStmt : (visibility whiteSpace)? DECLARE whiteSpace (PTRSAFE whiteSpace)? (FUNCTION | SUB) whiteSpace identifier whiteSpace LIB whiteSpace STRINGLITERAL (whiteSpace ALIAS whiteSpace STRINGLITERAL)? (whiteSpace? argList)? (whiteSpace asTypeClause)?;
+declareStmt : (visibility whiteSpace)? DECLARE whiteSpace (PTRSAFE whiteSpace)? (FUNCTION | SUB) whiteSpace identifier whiteSpace (CDECL whiteSpace)? LIB whiteSpace STRINGLITERAL (whiteSpace ALIAS whiteSpace STRINGLITERAL)? (whiteSpace? argList)? (whiteSpace asTypeClause)?;
 
 argList : LPAREN (whiteSpace? arg (whiteSpace? COMMA whiteSpace? arg)*)? whiteSpace? RPAREN;
 

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -99,7 +99,7 @@ private ModuleParseResults ParseInternal(QualifiedModuleName module, Cancellatio
 
             Logger.Trace($"ParseTaskID {taskId} begins attributes pass.");
             var (attributesParseTree, attributesTokenStream) = AttributesPassResults(module, cancellationToken);
-            var attributesRewriter = _moduleRewriterFactory.AttributesRewriter(module, attributesTokenStream ?? codePaneTokenStream);
+            var attributesRewriter = _moduleRewriterFactory.AttributesRewriter(module, attributesTokenStream);
             Logger.Trace($"ParseTaskID {taskId} finished attributes pass.");
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -153,7 +153,7 @@ private IEnumerable<CommentNode> QualifyAndUnionComments(QualifiedModuleName qua
         private (IParseTree tree, ITokenStream tokenStream) AttributesPassResults(QualifiedModuleName module, CancellationToken token)
         {
             token.ThrowIfCancellationRequested();
-            var code = _attributesSourceCodeProvider.SourceCode(module) ?? string.Empty;
+            var code = _attributesSourceCodeProvider.SourceCode(module);
             token.ThrowIfCancellationRequested();
             var attributesParseResults = _parser.Parse(module.ComponentName, module.ProjectId, code, token, CodeKind.AttributesCode);
             return attributesParseResults;