Format range #1043
Format range #1043
Conversation
akshita31
force-pushed
the
format_range
branch
from
dd5dbbd
to
41ffcc7
Compare
| var text = await document.GetTextAsync(); | ||
| var start = text.Lines.GetPosition(new LinePosition(request.Line, request.Column)); | ||
| var end = text.Lines.GetPosition(new LinePosition(request.EndLine, request.EndColumn)); | ||
| var changes = await FormattingWorker.GetFormattingChanges(document, start, end); | ||
| var tokenStart = document.GetSyntaxRootAsync().Result.FindToken(start).FullSpan.Start; |
| @@ -26,11 +26,12 @@ public FormatRangeService(OmniSharpWorkspace workspace) | |||
| { | |||
| return null; | |||
| } | |||
|
|
|||
| @@ -128,6 +128,85 @@ public void M () | |||
| new LinePositionSpanTextChange { StartLine = 2, StartColumn = 30, EndLine = 3, EndColumn = 0, NewText = "\n " }); | |||
| } | |||
|
|
|||
|
|
|||
| }; | ||
|
|
||
| await AssertTextChanges(string.Join("\r\n", source), | ||
| new LinePositionSpanTextChange { StartLine = 3, StartColumn = 5, EndLine = 4, EndColumn = 7, NewText = "\n" }); |
There was a problem hiding this comment.
This is really hard to read. How hard would it be to make it so the text change got applied and you could just specify the actual expected text?
| [Fact] | ||
| public async Task TextChangesOnStartingSpanAfterFirstCharacterInLine() | ||
| { | ||
| var source = new[] |
There was a problem hiding this comment.
I think you are storing all of these as string arrays and immediately string.join ing them. Might as well use string literals...
| public static IEnumerable<TextChange> GetTextChanges(SourceText oldText, IEnumerable<LinePositionSpanTextChange> changes) | ||
| { | ||
| var textChanges = new List<TextChange>(); | ||
| foreach( var change in changes) |
| textChanges.Add(new TextChange(span, newText)); | ||
| } | ||
|
|
||
| return textChanges.OrderBy(change => change.Span); |
There was a problem hiding this comment.
The changes returned by the service are arranged in descending order and the WithChanges function that we are using to get the new text for comparison requires the changes to be arranged in ascending order that is why this line has been added.
There was a problem hiding this comment.
Have you tested that? I thought SourceText.WithChanges didn't care about the order.
There was a problem hiding this comment.
|
|
||
| await AssertTextChanges(string.Join("\r\n", source), expected); | ||
| } | ||
|
|
| @@ -347,7 +336,7 @@ private static void AssertFormatTargetKind(SyntaxKind kind, string input) | |||
| 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) | |||
Issue : dotnet/vscode-csharp#214
On selecting after the first (alphanumeric) character in "Format Selection" , the code was not trimming the preceding white spaces in the first line of the selection. Modified the code to set the start of the span to the full span of the intersecting token and added the relevant test cases.
Please review : @DustinCampbell @TheRealPiotrP @rchande