Skip to content

Conversation

@Youssef1313
Copy link
Member

@Youssef1313 Youssef1313 commented Aug 22, 2020

Fixes #45158

The "OrElse" part was existing in IsValidStatementTerminator in ParserScan.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.

@Youssef1313 Youssef1313 marked this pull request as draft August 22, 2020 13:24
@Youssef1313 Youssef1313 marked this pull request as ready for review August 22, 2020 13:24
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.

Thanks @Youssef1313.

@Youssef1313
Copy link
Member Author

@cston Do you want to doc this bug as breaking change?
If yes, I need info about the version this bug was introduced in, and the version this PR fix will be in.
If not, you can close #46900

@Youssef1313 Youssef1313 marked this pull request as draft August 23, 2020 06:26
@Youssef1313 Youssef1313 marked this pull request as ready for review August 23, 2020 06:26
@Youssef1313 Youssef1313 marked this pull request as draft August 23, 2020 08:43
@Youssef1313 Youssef1313 marked this pull request as ready for review August 23, 2020 08:43
@jcouv jcouv added Area-Compilers Community The pull request was submitted by a contributor who is not a Microsoft employee. labels Aug 23, 2020
@Youssef1313
Copy link
Member Author

@cston, Can you look at the current build failure? I couldn't figure what's going on.

@cston cston requested a review from a team August 23, 2020 17:13
@333fred
Copy link
Member

333fred commented Aug 24, 2020

One test suggestion, otherwise this looks fine.

@Youssef1313 Youssef1313 marked this pull request as draft August 25, 2020 09:39
@Youssef1313 Youssef1313 marked this pull request as ready for review August 25, 2020 09:39
@ghost
Copy link

ghost commented Aug 25, 2020

Hello @333fred!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

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 (@msftbot) and give me an instruction to get started! Learn more here.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Auto-approval

@Youssef1313 Youssef1313 marked this pull request as draft August 26, 2020 12:07
@Youssef1313 Youssef1313 marked this pull request as ready for review August 26, 2020 12:08
@Youssef1313 Youssef1313 marked this pull request as draft August 26, 2020 15:00
@Youssef1313 Youssef1313 marked this pull request as ready for review August 26, 2020 15:00
@Youssef1313
Copy link
Member Author

Youssef1313 commented Aug 26, 2020

roslyn-CI (Windows_Desktop_Unit_Tests debug_32) Cancelled after 26m — Windows_Desktop_Unit_Tests debug_32 was canceled

@RikkiGibson @333fred Need build re-trigger here.

@cston cston merged commit 4e0ac64 into dotnet:master Aug 27, 2020
@ghost ghost added this to the Next milestone Aug 27, 2020
@cston
Copy link
Contributor

cston commented Aug 27, 2020

Thanks @Youssef1313.

@Youssef1313 Youssef1313 deleted the patch-21 branch August 27, 2020 06:41
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)
  ...
@allisonchou allisonchou modified the milestones: Next, 16.8.P3 Aug 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Compilers auto-merge Community The pull request was submitted by a contributor who is not a Microsoft employee.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Single-line vb if statement generates unreasonable compile error Missing parser error BC30205: End of statement expected.

5 participants