Fix bug when "End statement" is used in single-line if#47062
Merged
cston merged 7 commits intodotnet:masterfrom Aug 27, 2020
Merged
Fix bug when "End statement" is used in single-line if#47062cston merged 7 commits intodotnet:masterfrom
cston merged 7 commits intodotnet:masterfrom
Conversation
cston
reviewed
Aug 22, 2020
src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb
Outdated
Show resolved
Hide resolved
cston
reviewed
Aug 22, 2020
Youssef1313
commented
Aug 22, 2020
src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb
Outdated
Show resolved
Hide resolved
cston
reviewed
Aug 22, 2020
src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb
Outdated
Show resolved
Hide resolved
cston
reviewed
Aug 22, 2020
src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb
Show resolved
Hide resolved
Member
Author
Member
Author
|
@cston, Can you look at the current build failure? I couldn't figure what's going on. |
333fred
reviewed
Aug 24, 2020
src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Statements_Tests.vb
Show resolved
Hide resolved
Member
|
One test suggestion, otherwise this looks fine. |
333fred
approved these changes
Aug 25, 2020
|
Hello @333fred! Because this pull request has the p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
Member
Author
|
@RikkiGibson @333fred Need build re-trigger here. |
Contributor
|
Thanks @Youssef1313. |
333fred
added a commit
to 333fred/roslyn
that referenced
this pull request
Aug 27, 2020
…-only-errors * upstream/master: (236 commits) Fix bug when "End statement" is used in single-line if (dotnet#47062) Solution asset cache refactoring (dotnet#46948) add specific tests to validate behavior between keys and snapshots Extract into separate files rename parameters rename parameters rename parameters rename parameters Add CancellationToken parameters to SyntaxTreeOptionsProvider Reuse nullable override checks for delegate conversions (dotnet#46953) Introduce warning for multiple entry points (sync + async) (dotnet#46832) Switch from throwing NotImplementedException and return E_NOTIMPL Delete Building for Core CLR.md (dotnet#47146) Adjust PrintMembers to avoid boxing and avoid extra space (dotnet#47095) Track asynchronous operation in InProcLanguageServer Use Task.FromCanceled where appropriate Apply suggestions from code review Address feedback Expose ParseOptions on generator context (dotnet#46919) Remove redundant statement in added tests ...
333fred
added a commit
to 333fred/roslyn
that referenced
this pull request
Aug 28, 2020
* upstream/master: (220 commits) Don't load generators that target net framework explicitly. (dotnet#47100) Update src/Features/Core/Portable/UnifiedSuggestions/UnifiedSuggestedActionsSource.cs Clean up redundant code action filtering Remove IActiveStatementSpanTracker (dotnet#46826) Disable API analysis if telemetry is disabled Update src/Workspaces/Remote/ServiceHub/Services/CodeAnalysis/CodeAnalysisService_SemanticClassificationCache.cs Doc Compress two values. PR feedback Revert Revert Lint Fix formatting Fire and forget Fix mangling Ensure that local functions are also marked as invalid if their containing methods are generic. Fix dependency graph for AnalyzerRunner Add AnalyzerRunner target for net5.0 Make VerifyForwardedTypes asynchronous Fix bug when "End statement" is used in single-line if (dotnet#47062) ...
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
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.
Fixes #45158
The "OrElse" part was existing in
IsValidStatementTerminatorinParserScan.vb.It was removed in #14822 to fix #14761. However, this change caused the bug I mentioned in #45158.
If I put this "OrElse" part were it was originally, it will break the fix made in #14822. Hence, I moved it here where it's actually needed.
@AlekseyTs Please review.