Browse Source

fixed FindExpression after parameter list opening brace

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/vbnet@6153 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Siegfried Pammer 15 years ago
parent
commit
1da056e7c4
  1. 2
      src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg
  2. 4817
      src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs
  3. 4
      src/Libraries/NRefactory/Test/Lexer/VBNet/LexerContextTests.cs
  4. 24
      src/Main/Base/Test/VBExpressionFinderTests.cs

2
src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg

@ -570,7 +570,7 @@ CollectionInitializer = @@ -570,7 +570,7 @@ CollectionInitializer =
.
ExpressionSuffix =
"(" ( "Of" TypeName { "," TypeName } ")" | [ ArgumentList ] ")" )
"(" (. PushContext(Context.Expression, la, t); .) ( "Of" TypeName { "," TypeName } ")" | [ ArgumentList ] (. PopContext(); .) ")" )
| ( "." | "!" | ".@" | "..." ) (. nextTokenIsStartOfImportsOrAccessExpression = true; .) [ XmlOpenTag ] IdentifierOrKeyword [ XmlCloseTag ]
.

4817
src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs

File diff suppressed because it is too large Load Diff

4
src/Libraries/NRefactory/Test/Lexer/VBNet/LexerContextTests.cs

@ -444,6 +444,8 @@ End Module", @@ -444,6 +444,8 @@ End Module",
enter Expression
enter Expression
enter Expression
enter Expression
exit Expression
exit Expression
exit Expression
exit Expression
@ -519,6 +521,8 @@ End Module", @@ -519,6 +521,8 @@ End Module",
enter Expression
enter Expression
exit Expression
enter Expression
exit Expression
exit Expression
exit Expression
exit Body

24
src/Main/Base/Test/VBExpressionFinderTests.cs

@ -124,12 +124,12 @@ End Class @@ -124,12 +124,12 @@ End Class
Find(program1, " ", 1, "", ExpressionContext.Global);
}
[Test, Ignore]
[Test]
public void FindParameterStart()
{
Find(@"Module Program
Private Function CreateFolder(
End Module", "(", 1, "", ExpressionContext.Parameter);
End Module", "(", 1, "", ExpressionContext.IdentifierExpected);
}
[Test]
@ -137,6 +137,26 @@ End Module", "(", 1, "", ExpressionContext.Parameter); @@ -137,6 +137,26 @@ End Module", "(", 1, "", ExpressionContext.Parameter);
{
Find("Imports System\n", "\n", 1, "", ExpressionContext.Global);
}
[Test]
public void FindInArgumentList()
{
Find(@"Class MainClass
Sub Main()
Test(Test2(1) + Test2(2))
End Sub
End Class", "Test2", 2, "Te", ExpressionContext.Default);
}
[Test]
public void FindExpressionBeforeBrace()
{
Find(@"Class MainClass
Sub Main()
Test(Test2(1) + Test2(2))
End Sub
End Class", "Test2", 5, "Test2", ExpressionContext.Default);
}
#endregion
#region Context Tests

Loading…
Cancel
Save