Merge pull request #4830 from ScottDennison/next

Grammar cannot handle an empty moduleConfigProperty

Author: bclothier

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -59,7 +59,7 @@ moduleConfig :
 
 moduleConfigProperty :
     BEGINPROPERTY whiteSpace unrestrictedIdentifier (LPAREN numberLiteral RPAREN)? (whiteSpace GUIDLITERAL)? endOfStatement
-        (moduleConfigProperty | moduleConfigElement)+
+        (moduleConfigProperty | moduleConfigElement)*
     ENDPROPERTY endOfStatement
 ;
 

RubberduckTests/Grammar/VBAParserTests.cs

@@ -1092,6 +1092,50 @@ BeginProperty DataFormat {6D835690-900B-11D0-9484-00A0C91110ED}
       EndProperty
    End
 End
+";
+            var parseResult = Parse(code);
+            AssertTree(parseResult.Item1, parseResult.Item2, "//moduleConfigProperty", matches => matches.Count == 2);
+        }
+		
+        [Category("Parser")]
+        [Test]
+        public void TestNestedVbFormModuleConfigWithAnEmptyNestedProperty()
+        {
+            string code = @"
+VERSION 5.00
+Object = ""{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.1#0""; ""MSCOMCTL.OCX""
+Begin VB.Form Form1 
+   Caption         =   ""Form1""
+   ClientHeight    =   3195
+   ClientLeft      =   60
+   ClientTop       =   345
+   ClientWidth     =   4680
+   LinkTopic       =   ""Form1""
+   ScaleHeight     =   3195
+   ScaleWidth      =   4680
+   StartUpPosition =   3  'Windows Default
+   Begin MSComctlLib.StatusBar StatusBar1 
+      Align           =   2  'Align Bottom
+      Height          =   375
+      Left            =   0
+      TabIndex        =   0
+      Top             =   2820
+      Width           =   4680
+      _ExtentX        =   8255
+      _ExtentY        =   661
+      _Version        =   393216
+      BeginProperty Panels {8E3867A5-8586-11D1-B16A-00C0F0283628} 
+         NumPanels       =   1
+         BeginProperty Panel1 {8E3867AB-8586-11D1-B16A-00C0F0283628} 
+         EndProperty
+      EndProperty
+   End
+End
+Attribute VB_Name = ""Form1""
+Attribute VB_GlobalNameSpace = False
+Attribute VB_Creatable = False
+Attribute VB_PredeclaredId = True
+Attribute VB_Exposed = False
 ";
             var parseResult = Parse(code);
             AssertTree(parseResult.Item1, parseResult.Item2, "//moduleConfigProperty", matches => matches.Count == 2);