Browse Source

[Parser] Give ExpressionStatements with an invalid expression a semicolon if there was one in the file.

newNRvisualizers
Simon Lindgren 14 years ago
parent
commit
0c9704d216
  1. 3
      ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
  2. 45
      ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/InvalidStatementsTests.cs
  3. 1
      ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj

3
ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs

@ -1574,6 +1574,9 @@ namespace ICSharpCode.NRefactory.CSharp @@ -1574,6 +1574,9 @@ namespace ICSharpCode.NRefactory.CSharp
var expr = statementErrorExpression.Expr.Accept (this) as Expression;
if (expr != null)
result.AddChild ((Expression)expr, Roles.Expression);
var location = LocationsBag.GetLocations (statementErrorExpression);
if (location != null)
result.AddChild (new CSharpTokenNode (Convert (location [0])), Roles.Semicolon);
return result;
}

45
ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/InvalidStatementsTests.cs

@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
//
// InvalidStatementTests.cs
//
// Author:
// Simon Lindgren <simon.n.lindgren@gmail.com>
//
// Copyright (c) 2012 Simon Lindgren
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using NUnit.Framework;
using ICSharpCode.NRefactory.CSharp;
using ICSharpCode.NRefactory.CSharp.Parser;
namespace ICSharpCode.NRefactory.CSharp.Parser.Statements
{
[TestFixture]
public class InvalidStatementsTests
{
[Test]
public void AsExpressionStatementPositions()
{
ExpressionStatement expr = ParseUtilCSharp.ParseStatement<ExpressionStatement>("\t\t\"\" as IEnumerable<char>;", true);
Assert.AreEqual(new TextLocation(1, 3), expr.StartLocation);
Assert.AreEqual(new TextLocation(1, 27), expr.EndLocation);
}
}
}

1
ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj

@ -278,6 +278,7 @@ @@ -278,6 +278,7 @@
<Compile Include="CSharp\CodeActions\IterateViaForeachTests.cs" />
<Compile Include="CSharp\CodeActions\ExtractFieldTests.cs" />
<Compile Include="CSharp\CodeIssues\ValueParameterUnusedTests.cs" />
<Compile Include="CSharp\Parser\Statements\InvalidStatementsTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Mono.Cecil\Mono.Cecil.csproj">

Loading…
Cancel
Save