Fixes #4111

rubberduck-vba · Jun 23, 2018 · 57e51f3 · 57e51f3
1 parent 487f9d3
commit 57e51f3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/Rubberduck.Parsing/Grammar/VBAParser.g4 b/Rubberduck.Parsing/Grammar/VBAParser.g4
@@ -130,6 +130,7 @@ mainBlockStmt :
     | ifStmt
     | singleLineIfStmt
     | implementsStmt
+    | midStatement
     | letStmt
     | lsetStmt
     | onErrorStmt
@@ -462,9 +463,9 @@ redimVariableDeclaration : expression (whiteSpace asTypeClause)?;
 // This needs to be explicitly defined to distinguish between Mid as a function and Mid as a keyword.
 midStatement : modeSpecifier 
     LPAREN whiteSpace? 
-    lExpression whiteSpace? COMMA whiteSpace? lExpression whiteSpace? (COMMA whiteSpace? lExpression whiteSpace?)? 
+    lExpression whiteSpace? COMMA whiteSpace? expression whiteSpace? (COMMA whiteSpace? expression whiteSpace?)? 
     RPAREN 
-    whiteSpace? ASSIGN whiteSpace? 
+    whiteSpace? EQ whiteSpace? 
     expression;
 modeSpecifier :	(MID | MIDB) DOLLAR? ;
 

diff --git a/RubberduckTests/Grammar/VBAParserTests.cs b/RubberduckTests/Grammar/VBAParserTests.cs
@@ -2859,6 +2859,21 @@ End Type
             AssertTree(parseResult.Item1, parseResult.Item2, "//commentOrAnnotation", matches => matches.Count == 1);
         }
 
+        [Category("Parser")]
+        [Test]
+        public void MidStatement()
+        {
+            const string code = @"
+Public Sub Test()
+    Dim TestString As String
+    TestString = ""The dog jumps""
+    Mid(TestString, 5, 3) = ""fox""
+End Sub
+";
+            var parseResult = Parse(code);
+            AssertTree(parseResult.Item1, parseResult.Item2, "//midStatement", matches => matches.Count == 1);
+        }
+
         private Tuple<VBAParser, ParserRuleContext> Parse(string code, PredictionMode predictionMode = null)
         {
             var stream = new AntlrInputStream(code);