Skip to content

Commit

Permalink
Unskip tests that were skipped due to adaptive formatting triggering
Browse files Browse the repository at this point in the history
We had tests that set "use tabs" but then were working in a file of
mostly spaces. The editor behavior now is to treat this as if the
file had the "use spaces" on. I alternatively could have chosen to
disable inferrence, but then it seems we're not actually testing the
more mainline scenario of somebody having tabs in the entire file, which
seems like it's worth testing over odd mixed cases.

Closes dotnet#39967
  • Loading branch information
jasonmalinowski committed Dec 11, 2019
1 parent 6bdee08 commit 165dea1
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 60 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1341,30 +1341,30 @@ void M()
}

[WorkItem(2108, "https://github.com/dotnet/roslyn/issues/2108")]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/39967"), Trait(Traits.Feature, Traits.Features.DocumentationComments)]
[WpfFact, Trait(Traits.Feature, Traits.Features.DocumentationComments)]
public void PressingEnter_Indentation5_UseTabs()
{
const string code =
@"class C
{
/// <summary>
/// <summary>
/// hello world$$
/// </summary>
void M()
{
}
/// </summary>
void M()
{
}
}";

const string expected =
@"class C
{
/// <summary>
/// <summary>
/// hello world
/// $$
/// </summary>
void M()
{
}
/// </summary>
void M()
{
}
}";

VerifyPressingEnter(code, expected, useTabs: true);
Expand Down Expand Up @@ -1813,30 +1813,30 @@ void M()
}

[WorkItem(2090, "https://github.com/dotnet/roslyn/issues/2090")]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/39967"), Trait(Traits.Feature, Traits.Features.DocumentationComments)]
[WpfFact, Trait(Traits.Feature, Traits.Features.DocumentationComments)]
public void TestOpenLineAbove4_Tabs()
{
const string code =
@"class C
{
/// <summary>
/// $$stuff
/// </summary>
void M()
{
}
/// $$stuff
/// </summary>
void M()
{
}
}";

const string expected =
@"class C
{
/// <summary>
/// $$
/// stuff
/// </summary>
void M()
{
}
/// stuff
/// </summary>
void M()
{
}
}";

VerifyOpenLineAbove(code, expected, useTabs: true);
Expand Down Expand Up @@ -1923,30 +1923,30 @@ public void TestOpenLineBelow3()
}

[WorkItem(2090, "https://github.com/dotnet/roslyn/issues/2090")]
[WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/39967"), Trait(Traits.Feature, Traits.Features.DocumentationComments)]
[WpfFact, Trait(Traits.Feature, Traits.Features.DocumentationComments)]
public void TestOpenLineBelow4_Tabs()
{
const string code =
@"class C
{
/// <summary>
/// <summary>
/// $$stuff
/// </summary>
void M()
{
}
/// </summary>
void M()
{
}
}";

const string expected =
@"class C
{
/// <summary>
/// <summary>
/// stuff
/// $$
/// </summary>
void M()
{
}
/// </summary>
void M()
{
}
}";

VerifyOpenLineBelow(code, expected, useTabs: true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -763,25 +763,25 @@ End Class
End Sub

<WorkItem(2108, "https://github.com/dotnet/roslyn/issues/2108")>
<WpfFact(Skip:="https://github.com/dotnet/roslyn/issues/39967"), Trait(Traits.Feature, Traits.Features.DocumentationComments)>
<WpfFact, Trait(Traits.Feature, Traits.Features.DocumentationComments)>
Public Sub TestPressingEnter_Indentation5_UseTabs()
Const code = "
Class C
''' <summary>
''' <summary>
''' hello world$$
''' </summary>
Sub M()
End Sub
''' </summary>
Sub M()
End Sub
End Class
"
Const expected = "
Class C
''' <summary>
''' <summary>
''' hello world
''' $$
''' </summary>
Sub M()
End Sub
''' </summary>
Sub M()
End Sub
End Class
"
VerifyPressingEnter(code, expected, useTabs:=True)
Expand Down Expand Up @@ -1083,25 +1083,25 @@ End Class
End Sub

<WorkItem(2090, "https://github.com/dotnet/roslyn/issues/2090")>
<WpfFact(Skip:="https://github.com/dotnet/roslyn/issues/39967"), Trait(Traits.Feature, Traits.Features.DocumentationComments)>
<WpfFact, Trait(Traits.Feature, Traits.Features.DocumentationComments)>
Public Sub TestOpenLineAbove4_Tabs()
Const code = "
Class C
''' <summary>
''' $$stuff
''' </summary>
Sub M()
End Sub
''' $$stuff
''' </summary>
Sub M()
End Sub
End Class
"
Const expected = "
Class C
''' <summary>
''' $$
''' stuff
''' </summary>
Sub M()
End Sub
''' stuff
''' </summary>
Sub M()
End Sub
End Class
"
VerifyOpenLineAbove(code, expected, useTabs:=True)
Expand Down Expand Up @@ -1173,25 +1173,25 @@ End Class
End Sub

<WorkItem(2090, "https://github.com/dotnet/roslyn/issues/2090")>
<WpfFact(Skip:="https://github.com/dotnet/roslyn/issues/39967"), Trait(Traits.Feature, Traits.Features.DocumentationComments)>
<WpfFact, Trait(Traits.Feature, Traits.Features.DocumentationComments)>
Public Sub TestOpenLineBelow4_Tabs()
Const code = "
Class C
''' <summary>
''' <summary>
''' $$stuff
''' </summary>
Sub M()
End Sub
''' </summary>
Sub M()
End Sub
End Class
"
Const expected = "
Class C
''' <summary>
''' <summary>
''' stuff
''' $$
''' </summary>
Sub M()
End Sub
''' </summary>
Sub M()
End Sub
End Class
"
VerifyOpenLineBelow(code, expected, useTabs:=True)
Expand Down

0 comments on commit 165dea1

Please sign in to comment.