Skip to content

Calculate exception regions when an active statement is deleted #5744

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

Merged
tmat merged 1 commit into from
Oct 7, 2015
Merged

Calculate exception regions when an active statement is deleted #5744

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
163 changes: 163 additions & 0 deletions src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5088,6 +5088,169 @@ static void Foo()
edits.VerifyRudeDiagnostics(active);
}

[Fact]
public void TryFinally_DeleteStatement_Inner()
{
string src1 = @"
class C
{
static void Main()
{
<AS:0>Console.WriteLine(0);</AS:0>

try
{
<AS:1>Console.WriteLine(1);</AS:1>
}
<ER:1.0>finally
{
Console.WriteLine(2);
}</ER:1.0>
}
}";
string src2 = @"
class C
{
static void Main()
{
<AS:0>Console.WriteLine(0);</AS:0>

try
{
<AS:1>}</AS:1>
finally
{
Console.WriteLine(2);
}
}
}";
var edits = GetTopEdits(src1, src2);
var active = GetActiveStatements(src1, src2);

edits.VerifyRudeDiagnostics(active,
Diagnostic(RudeEditKind.DeleteActiveStatement, "{"));
}

[Fact]
public void TryFinally_DeleteStatement_Leaf()
{
string src1 = @"
class C
{
static void Main(string[] args)
{
<ER:0.0>try
{
Console.WriteLine(0);
}
finally
{
<AS:0>Console.WriteLine(1);</AS:0>
}</ER:0.0>
}
}";
string src2 = @"
class C
{
static void Main(string[] args)
{
try
{
Console.WriteLine(0);
}
finally
{
<AS:0>}</AS:0>
}
}";
var edits = GetTopEdits(src1, src2);
var active = GetActiveStatements(src1, src2);

edits.VerifyRudeDiagnostics(active,
Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "finally", CSharpFeaturesResources.FinallyClause));
}

[Fact]
public void Try_DeleteStatement_Inner()
{
string src1 = @"
class C
{
static void Main()
{
<AS:0>Console.WriteLine(0);</AS:0>

try
{
<AS:1>Console.WriteLine(1);</AS:1>
}
finally
{
Console.WriteLine(2);
}
}
}";
string src2 = @"
class C
{
static void Main()
{
<AS:0>Console.WriteLine(0);</AS:0>

try
{
<AS:1>}</AS:1>
finally
{
Console.WriteLine(2);
}
}
}";
var edits = GetTopEdits(src1, src2);
var active = GetActiveStatements(src1, src2);

edits.VerifyRudeDiagnostics(active,
Diagnostic(RudeEditKind.DeleteActiveStatement, "{"));
}

[Fact]
public void Try_DeleteStatement_Leaf()
{
string src1 = @"
class C
{
static void Main()
{
try
{
<AS:0>Console.WriteLine(1);</AS:0>
}
finally
{
Console.WriteLine(2);
}
}
}";
string src2 = @"
class C
{
static void Main()
{
try
{
<AS:0>}</AS:0>
finally
{
Console.WriteLine(2);
}
}
}";
var edits = GetTopEdits(src1, src2);
var active = GetActiveStatements(src1, src2);

edits.VerifyRudeDiagnostics(active);
}

#endregion

#region Catch
Expand Down
129 changes: 129 additions & 0 deletions src/EditorFeatures/VisualBasicTest/EditAndContinue/ActiveStatementTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3447,6 +3447,135 @@ End Class
edits.VerifyRudeDiagnostics(active)
End Sub

<Fact>
Public Sub TryFinally_DeleteStatement_Inner()
Dim src1 = "
Class C
Sub Main()
<AS:0>Console.WriteLine(0)</AS:0>

Try
<AS:1>Console.WriteLine(1)</AS:1>
<ER:1.0>Finally
Console.WriteLine(2)
End Try</ER:1.0>
End Sub
End Class
"
Dim src2 = "
Class C
Sub Main()
<AS:0>Console.WriteLine(0)</AS:0>

<AS:1>Try</AS:1>
Finally
Console.WriteLine(2)
End Try
End Sub
End Class
"
Dim edits = GetTopEdits(src1, src2)
Dim active = GetActiveStatements(src1, src2)

edits.VerifyRudeDiagnostics(active,
Diagnostic(RudeEditKind.DeleteActiveStatement, "Try"))
End Sub

<Fact>
Public Sub TryFinally_DeleteStatement_Leaf()
Dim src1 = "
Class C
Sub Main()
<ER:0.0>Try
Console.WriteLine(0)
Finally
<AS:0>Console.WriteLine(1)</AS:0>
End Try</ER:0.0>
End Sub
End Class
"
Dim src2 = "
Class C
Sub Main()
Try
Console.WriteLine(0)
<AS:0>Finally</AS:0>
End Try
End Sub
End Class
"
Dim edits = GetTopEdits(src1, src2)
Dim active = GetActiveStatements(src1, src2)

edits.VerifyRudeDiagnostics(active,
Diagnostic(RudeEditKind.UpdateAroundActiveStatement, "Finally", VBFeaturesResources.FinallyClause))
End Sub

<Fact>
Public Sub Try_DeleteStatement_Inner()
Dim src1 = "
Class C
Sub Main()
<AS:0>Console.WriteLine(0)</AS:0>

Try
<AS:1>Console.WriteLine(1)</AS:1>
Finally
Console.WriteLine(2)
End Try
End Sub
End Class
"
Dim src2 = "
Class C
Sub Main()
<AS:0>Console.WriteLine(0)</AS:0>

<AS:1>Try</AS:1>
Finally
Console.WriteLine(2)
End Try
End Sub
End Class
"
Dim edits = GetTopEdits(src1, src2)
Dim active = GetActiveStatements(src1, src2)

edits.VerifyRudeDiagnostics(active,
Diagnostic(RudeEditKind.DeleteActiveStatement, "Try"))
End Sub

<Fact>
Public Sub Try_DeleteStatement_Leaf()
Dim src1 = "
Class C
Sub Main()

Try
<AS:0>Console.WriteLine(1)</AS:0>
Finally
Console.WriteLine(2)
End Try
End Sub
End Class
"
Dim src2 = "
Class C
Sub Main()

<AS:0>Try</AS:0>
Finally
Console.WriteLine(2)
End Try
End Sub
End Class
"
Dim edits = GetTopEdits(src1, src2)
Dim active = GetActiveStatements(src1, src2)

edits.VerifyRudeDiagnostics(active)
End Sub

<Fact>
Public Sub Catch_Add_Inner()
Dim src1 = "
Expand Down
6 changes: 3 additions & 3 deletions src/Features/CSharp/Portable/EditAndContinue/CSharpEditAndContinueAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2780,7 +2780,7 @@ internal override void ReportEnclosingExceptionHandlingRudeEdits(
List<RudeEditDiagnostic> diagnostics,
IEnumerable<Edit<SyntaxNode>> exceptionHandlingEdits,
SyntaxNode oldStatement,
SyntaxNode newStatement)
TextSpan newStatementSpan)
{
foreach (var edit in exceptionHandlingEdits)
{
Expand All @@ -2789,7 +2789,7 @@ internal override void ReportEnclosingExceptionHandlingRudeEdits(

if (edit.Kind != EditKind.Update || !AreExceptionClausesEquivalent(edit.OldNode, edit.NewNode))
{
AddRudeDiagnostic(diagnostics, edit.OldNode, edit.NewNode, newStatement);
AddRudeDiagnostic(diagnostics, edit.OldNode, edit.NewNode, newStatementSpan);
}
}
}
Expand Down Expand Up @@ -3053,7 +3053,7 @@ private void ReportRudeEditsForCheckedStatements(

if (isRude)
{
AddRudeDiagnostic(diagnostics, oldCheckedStatement, newCheckedStatement, newActiveStatement);
AddRudeDiagnostic(diagnostics, oldCheckedStatement, newCheckedStatement, newActiveStatement.Span);
}
}

Expand Down
Loading