Merge pull request #4257 from comintern/next

Parser NRE hotfix.

Author: comintern

Rubberduck.Parsing/VBA/Parsing/ModuleParser.cs

@@ -94,7 +94,7 @@ private ModuleParseResults ParseInternal(QualifiedModuleName module, Cancellatio
             // otherwise none of the annotations get associated to their respective Declaration
             Logger.Trace($"ParseTaskID {taskId} begins extracting comments and annotations.");
             var (comments, annotations) = CommentsAndAnnotations(module, codePaneParseTree);
-            Logger.Trace($"ParseTaskID {taskId} fniished extracting comments and annotations.");
+            Logger.Trace($"ParseTaskID {taskId} finished extracting comments and annotations.");
             cancellationToken.ThrowIfCancellationRequested();
 
             Logger.Trace($"ParseTaskID {taskId} begins attributes pass.");
@@ -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);
+            var code = _attributesSourceCodeProvider.SourceCode(module) ?? string.Empty;
             token.ThrowIfCancellationRequested();
             var attributesParseResults = _parser.Parse(module.ComponentName, module.ProjectId, code, token, CodeKind.AttributesCode);
             return attributesParseResults;

Rubberduck.Parsing/VBA/Parsing/VBACodeStringParser.cs

@@ -40,7 +40,7 @@ public enum ParserMode
         public VBACodeStringParser(string moduleName, string moduleCodeString, ParserMode mode = ParserMode.Default)
         {
             var tokenStreamProvider = new SimpleVBAModuleTokenStreamProvider();
-            _tokenStream = tokenStreamProvider.Tokens(moduleCodeString);
+            _tokenStream = tokenStreamProvider.Tokens(moduleCodeString ?? string.Empty);
             _parser = new VBAParser(_tokenStream);
             _parser.AddErrorListener(new MainParseExceptionErrorListener(moduleName, CodeKind.SnippetCode));
             _moduleName = moduleName;

RubberduckTests/Parsing/VBACodeStringParserTests.cs

@@ -102,5 +102,25 @@ Public Sub Foo
 
             Assert.IsInstanceOf<IParseTree>(parser.Parse().parseTree);
         }
+
+        [Test]
+        [Category("VBACodeStringParser_Tests")]
+        public void CanParseEmptyModule()
+        {
+            const string inputCode = @"";
+
+            var parser = new VBACodeStringParser("test", inputCode);
+            Assert.IsInstanceOf<IParseTree>(parser.Parse().parseTree);
+        }
+
+        [Test]
+        [Category("VBACodeStringParser_Tests")]
+        public void CanParseNullInput()
+        {
+            const string inputCode = null;
+
+            var parser = new VBACodeStringParser("test", inputCode);
+            Assert.IsInstanceOf<IParseTree>(parser.Parse().parseTree);
+        }
     }
 }