Merge consequent open decls and hash directives into single structure blocks#3971
Merged
KevinRansom merged 3 commits intodotnet:masterfrom Nov 22, 2017
Conversation
Contributor
Author
|
@dotnet-bot test Ubuntu14.04 Release_fcs Build please |
saul
reviewed
Nov 19, 2017
src/fsharp/vs/ServiceStructure.fs
Outdated
Contributor
There was a problem hiding this comment.
Are we better off with IsNullOrWhitespace here?
Contributor
Author
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
vasily-kirichenko
force-pushed
the
combine-sparse-open-decls-and-hash-directives
branch
from
9a6a79b to
01a235d
Compare
Contributor
|
LGTM. Add a test to tests/service please |
…-decls-and-hash-directives
Contributor
Author
|
@dsyme done. |
Contributor
|
@vasily-kirichenko Wow, thank you for such extensive tests, those are fantastic. Very impressive |
dsyme
approved these changes
Nov 21, 2017
KevinRansom
approved these changes
Nov 22, 2017
| | 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 -> |
Contributor
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) | |||
Contributor
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 file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes https://youtrack.jetbrains.com/issue/RIDER-10324
/cc @auduchinok