Skip to content

Conversation

@RikkiGibson
Copy link
Member

@RikkiGibson RikkiGibson commented Feb 15, 2020

This PR integrates changes from master including #41585, which requires some manual fixup.

Suggest reviewing commit-by-commit starting with 9a88cd4.

msftbot[bot] and others added 12 commits December 6, 2019 19:39
…-release/dev16.4-vs-deps

Merge release/dev16.4 to release/dev16.4-vs-deps
…-release/dev16.4-vs-deps

Merge release/dev16.4 to release/dev16.4-vs-deps
…-release/dev16.4-vs-deps

Merge release/dev16.4 to release/dev16.4-vs-deps
…-release/dev16.4-vs-deps

Merge release/dev16.4 to release/dev16.4-vs-deps
We suppressed these because we were on the .NET Portable profile and
thus couldn't do the anything else. We're no longer on the portable
profile.
…214.5 (dotnet#41720)

- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20114.5
@RikkiGibson RikkiGibson requested a review from a team as a code owner February 15, 2020 19:58
@RikkiGibson RikkiGibson force-pushed the lfa-inlineStatementParsing branch from 58eee05 to b0b39ba Compare February 15, 2020 20:37
Copy link
Member Author

Choose a reason for hiding this comment

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

I arbitrarily let the name change back to ParseStatementCore, but it can still return null, even if isGlobalScriptLevel is false.

@RikkiGibson RikkiGibson force-pushed the lfa-inlineStatementParsing branch from 009de58 to 48e6e55 Compare February 19, 2020 20:17
@RikkiGibson RikkiGibson requested review from a team as code owners February 19, 2020 20:17
@RikkiGibson RikkiGibson requested review from a team and removed request for a team February 19, 2020 20:17
@RikkiGibson RikkiGibson force-pushed the lfa-inlineStatementParsing branch from 48e6e55 to 29dadf0 Compare February 19, 2020 20:26
@RikkiGibson RikkiGibson changed the title Lfa inline statement parsing Merge master to local-function-attributes Feb 19, 2020
Copy link
Contributor

@cston cston left a comment

Choose a reason for hiding this comment

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

Last 3 commits LGTM.

@RikkiGibson RikkiGibson requested a review from a team February 20, 2020 18:30
@RikkiGibson
Copy link
Member Author

@dotnet/roslyn-compiler could I please get a second review on the last few commits in this PR (starting with 9a88cd4).

@RikkiGibson
Copy link
Member Author

Added a few more tests that were necessary before feature merge and deleted a PROTOTYPE comment.

@RikkiGibson RikkiGibson merged commit 081a7a5 into dotnet:features/local-function-attributes Feb 21, 2020
@RikkiGibson RikkiGibson deleted the lfa-inlineStatementParsing branch February 21, 2020 01:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.