Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix argumentList #5441

Merged
merged 1 commit into from
Mar 24, 2020
Merged

Fix argumentList #5441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Rubberduck.Parsing/Grammar/VBAParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ builtInType :
;

// 5.6.13.1 Argument Lists
argumentList : whiteSpace? (argument? (whiteSpace? COMMA whiteSpace? argument)*)?? whiteSpace?
argumentList : whiteSpace? (argument (whiteSpace? COMMA whiteSpace? argument)*)? whiteSpace?
;

requiredArgument : argument;
Expand Down
97 changes: 95 additions & 2 deletions RubberduckTests/Grammar/VBAParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3481,7 +3481,7 @@ End Sub


[Test]
public void LeftOutOptionalArgumentsAreCountedAsMissingArguments()
public void LeftOutOptionalArgumentsAreCountedAsMissingArguments_Mid_Function()
{
const string code = @"
Public Sub Test()
Expand All @@ -3498,7 +3498,100 @@ End Function
AssertTree(parseResult.Item1, parseResult.Item2, "//argumentList", matches => matches.Count == 1);
}



[Test]
public void LeftOutOptionalArgumentsAreCountedAsMissingArguments_Mid_Procedure()
{
const string code = @"
Public Sub Test()
Dim x As Long
Foo 1, , 5
End Sub

Public Sub Foo(a, Optional b, Optional c)
End Sub
";
var parseResult = Parse(code);
AssertTree(parseResult.Item1, parseResult.Item2, "//missingArgument", matches => matches.Count == 1);
AssertTree(parseResult.Item1, parseResult.Item2, "//argumentList", matches => matches.Count == 1);
}


[Test]
public void LeftOutOptionalArgumentsAreCountedAsMissingArguments_MultipleAtStart_Function()
{
const string code = @"
Public Sub Test()
Dim x As Long
x = Foo(, , 5)
End Sub

Public Function Foo(Optional a, Optional b, Optional c) As Long
Foo = 42
End Function
";
var parseResult = Parse(code);
AssertTree(parseResult.Item1, parseResult.Item2, "//missingArgument", matches => matches.Count == 2);
AssertTree(parseResult.Item1, parseResult.Item2, "//argumentList", matches => matches.Count == 1);
}


[Test]
public void LeftOutOptionalArgumentsAreCountedAsMissingArguments_SingleAtStart_Function()
{
const string code = @"
Public Sub Test()
Dim x As Long
x = Foo(, 1, 5)
End Sub

Public Function Foo(Optional a, Optional b, Optional c) As Long
Foo = 42
End Function
";
var parseResult = Parse(code);
AssertTree(parseResult.Item1, parseResult.Item2, "//missingArgument", matches => matches.Count == 1);
AssertTree(parseResult.Item1, parseResult.Item2, "//argumentList", matches => matches.Count == 1);
}


[Test]
public void LeftOutOptionalArgumentsAreCountedAsMissingArguments_AtStart_Procedure()
{
const string code = @"
Public Sub Test()
Dim x As Long
Foo , , 5
End Sub

Public Sub Foo(Optional a, Optional b, Optional c)
End Sub
";
var parseResult = Parse(code);
AssertTree(parseResult.Item1, parseResult.Item2, "//missingArgument", matches => matches.Count == 2);
AssertTree(parseResult.Item1, parseResult.Item2, "//argumentList", matches => matches.Count == 1);
}


[Test]
//See issue #5440 at https://github.com/rubberduck-vba/Rubberduck/issues/5440
public void LeftOutOptionalArgumentsAreCountedAsMissingArguments_OneAtStart_Procedure()
{
const string code = @"
Public Sub Test()
Dim x As Long
Foo , 1, 5
End Sub

Public Sub Foo(Optional a, Optional b, Optional c)
End Sub
";
var parseResult = Parse(code);
AssertTree(parseResult.Item1, parseResult.Item2, "//missingArgument", matches => matches.Count == 1);
AssertTree(parseResult.Item1, parseResult.Item2, "//argumentList", matches => matches.Count == 1);
}


[Test]
public void TestReDimWithLineContinuation()
{
Expand Down