Skip to content
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

Jump to bottom

Format range #1043

Merged
merged 9 commits into from
Dec 11, 2017
Merged

Format range #1043

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ba6e969
Added test for failing cases
akshita31 Dec 1, 2017
4e16b20
Using full span of the intersecing token
akshita31 Dec 5, 2017
41ffcc7
Added test for multiple lines
akshita31 Dec 5, 2017
e5383ee
Added text instead of array of changes in the tests
akshita31 Dec 5, 2017
40098ee
Removed unnecessary line
akshita31 Dec 5, 2017
18955cf
Using string literals
akshita31 Dec 6, 2017
35117b1
Added Space
akshita31 Dec 7, 2017
c54de26
Merge branch 'master' into format_range
DustinCampbell Dec 7, 2017
a204624
Merge branch 'master' into format_range
DustinCampbell Dec 9, 2017
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
89 changes: 39 additions & 50 deletions tests/OmniSharp.Roslyn.CSharp.Tests/FormattingFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,14 @@ await AssertTextChanges(string.Join("\r\n", source),
[Fact]
public async Task TextChangesOnStaringSpanBeforeFirstCharacterInLine()
{
var source = new[]
{
"class Program",
"{",
" public static void Main()",
" {",
"[| int foo = 1;|]",
" }",
"}",
};
var source =
@"class Program
{
public static void Main()
{
[| int foo = 1;|]
}
}";

var expected =
@"class Program
Expand All @@ -153,23 +151,20 @@ public static void Main()
}
}";

await AssertTextChanges(string.Join("\r\n", source), expected);
await AssertTextChanges(source, expected);
}

[Fact]
public async Task TextChangesOnStartingSpanAtFirstCharacterInLine()
{
var source = new[]
{
"class Program",
"{",
" public static void Main()",
" {",
" [|int foo = 1;|]",
" }",
"}",
};

var source =
@"class Program
{
public static void Main()
{
[|int foo = 1;|]
}
}";
var expected =
@"class Program
{
Expand All @@ -179,22 +174,20 @@ public static void Main()
}
}";

await AssertTextChanges(string.Join("\r\n", source), expected);
await AssertTextChanges(source, expected);
}

[Fact]
public async Task TextChangesOnStartingSpanAfterFirstCharacterInLine()
{
var source = new[]
{
"class Program",
"{",
" public static void Main()",
" {",
" i[|nt foo = 1;|]",
" }",
"}",
};
var source =
@"class Program
{
public static void Main()
{
i[|nt foo = 1;|]
}
}";

var expected =
@"class Program
Expand All @@ -205,24 +198,22 @@ public static void Main()
}
}";

await AssertTextChanges(string.Join("\r\n", source), expected);
await AssertTextChanges(source, expected);
}

[Fact]
public async Task TextChangesOnStartingSpanAfterFirstCharacterInLineWithMultipleLines()
{
var source = new[]
{
"class Program",
"{",
" public static void Main()",
" {",
" i[|nt foo = 1;",
" bool b = false;",
" Console.WriteLine(foo);|]",
" }",
"}",
};
var source =
@"class Program
{
public static void Main()
{
i[|nt foo = 1;
bool b = false;
Console.WriteLine(foo);|]
}
}";

var expected =
@"class Program
Expand All @@ -235,11 +226,9 @@ public static void Main()
}
}";

await AssertTextChanges(string.Join("\r\n", source), expected);
await AssertTextChanges(source, expected);
}

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra blanks



[Fact]
public async Task FormatRespectsIndentationSize()
{
Expand Down Expand Up @@ -347,7 +336,7 @@ private async Task AssertTextChanges(string source, string expected)
public static IEnumerable<TextChange> GetTextChanges(SourceText oldText, IEnumerable<LinePositionSpanTextChange> changes)
{
var textChanges = new List<TextChange>();
foreach( var change in changes)
foreach(var change in changes)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

foreach (var change ...)

{
var startPosition = new LinePosition(change.StartLine, change.StartColumn);
var endPosition = new LinePosition(change.EndLine, change.EndColumn);
Expand Down