From 0c9704d2169311ea8b50ca78fb12613f3af08d9a Mon Sep 17 00:00:00 2001 From: Simon Lindgren Date: Wed, 13 Jun 2012 23:53:23 +0200 Subject: [PATCH] [Parser] Give ExpressionStatements with an invalid expression a semicolon if there was one in the file. --- .../Parser/CSharpParser.cs | 3 ++ .../Statements/InvalidStatementsTests.cs | 45 +++++++++++++++++++ .../ICSharpCode.NRefactory.Tests.csproj | 1 + 3 files changed, 49 insertions(+) create mode 100644 ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/InvalidStatementsTests.cs diff --git a/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs b/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs index 3f2c274438..81d685e648 100644 --- a/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs +++ b/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs @@ -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; } diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/InvalidStatementsTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/InvalidStatementsTests.cs new file mode 100644 index 0000000000..7efd20479c --- /dev/null +++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Statements/InvalidStatementsTests.cs @@ -0,0 +1,45 @@ +// +// InvalidStatementTests.cs +// +// Author: +// Simon Lindgren +// +// 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("\t\t\"\" as IEnumerable;", true); + Assert.AreEqual(new TextLocation(1, 3), expr.StartLocation); + Assert.AreEqual(new TextLocation(1, 27), expr.EndLocation); + } + } +} + diff --git a/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj b/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj index b9196ce2d0..579b02a93f 100644 --- a/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj +++ b/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj @@ -278,6 +278,7 @@ +