Uh oh!
There was an error while loading. Please reload this page.
Merge consequent open decls and hash directives into single structure blocks - #3971
Conversation
vasily-kirichenko
commented
Nov 18, 2017
@dotnet-bot test Ubuntu14.04 Release_fcs Build please |
There was a problem hiding this comment.
Are we better off with IsNullOrWhitespace here?
There was a problem hiding this comment.
omg yes, I was sure I use this function :( Thanks for the review. Fixed.
# Conflicts: # src/fsharp/TypeChecker.fs
9a6a79b to
01a235dComparedsyme
commented
Nov 20, 2017
LGTM. Add a test to tests/service please |
…-decls-and-hash-directives
vasily-kirichenko
commented
Nov 20, 2017
@dsyme done. |
dsyme
commented
Nov 21, 2017
@vasily-kirichenko Wow, thank you for such extensive tests, those are fantastic. Very impressive |
| | r :: rest, last :: _ when r.StartLine = last.EndLine + 1 -> | ||
| | r :: rest, last :: _ | ||
| when r.StartLine = last.EndLine + 1 || | ||
| sourceLines.[last.EndLine..r.StartLine - 2] |> Array.forall System.String.IsNullOrWhiteSpace -> |
There was a problem hiding this comment.
@vasily-kirichenko what is it that ensures that r.StartLine > 2 here? Is it possible that r.StartLine may = 1?
| @@ -545,7 +545,9 @@ module Structure = | |||
| | [], [] -> List.rev res | |||
| | [], _ -> List.rev (currentBulk::res) | |||
There was a problem hiding this comment.
I imagine that currentBulk is a legacy typo for currentBlk, it probably makes sense to fix this while here.
This fixes https://youtrack.jetbrains.com/issue/RIDER-10324
/cc @auduchinok