Skip to content

Merge consequent open decls and hash directives into single structure blocks #3971

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

Merged
merged 3 commits into from
Nov 22, 2017
Merged

Merge consequent open decls and hash directives into single structure blocks #3971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01a235d
Merge branch 'combine-sparse-open-decls-and-hash-directives' into rider
vasily-kirichenko Nov 18, 2017
0924b51
add Structure tests
vasily-kirichenko Nov 20, 2017
d817b5e
Merge remote-tracking branch 'origin/master' into combine-sparse-open…
vasily-kirichenko Nov 20, 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
4 changes: 3 additions & 1 deletion src/fsharp/vs/ServiceStructure.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,9 @@ module Structure =
| [], [] -> List.rev res
| [], _ -> List.rev (currentBulk::res)
Copy link
Contributor

@KevinRansom KevinRansom Nov 20, 2017

Choose a reason for hiding this comment

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

I imagine that currentBulk is a legacy typo for currentBlk, it probably makes sense to fix this while here.

| r :: rest, [] -> loop rest res [r]
| 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 ->
Copy link
Contributor

@KevinRansom KevinRansom Nov 20, 2017

Choose a reason for hiding this comment

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

@vasily-kirichenko what is it that ensures that r.StartLine > 2 here? Is it possible that r.StartLine may = 1?

loop rest res (r::currentBulk)
| r :: rest, _ -> loop rest (currentBulk::res) [r]
loop input [] []
Expand Down
Loading