Skip to content
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.

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

Combine VB comparers into one, and combine VB and C# comparers together #51834

Merged
merged 8 commits into from
Mar 25, 2021

Conversation

davidwengier
Copy link
Contributor

Fixes #51169

Apologies this is going to be a pain to review, as its pretty much all just code moves.

@davidwengier davidwengier requested a review from a team as a code owner March 12, 2021 11:16
@davidwengier
Copy link
Contributor Author

One test failed. That's very surprising. Figured I would have made a mistake and most of this would be on the floor, or I would have done it right and it would all be green. Only one is odd. Will look into it on Monday.

…ment syntax.

This bit of logic got dropped accidentally.
Copy link
Member

@tmat tmat left a comment

Choose a reason for hiding this comment

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

🕐

@davidwengier
Copy link
Contributor Author

@tmat this should be good to go?

Copy link
Member

@tmat tmat left a comment

Choose a reason for hiding this comment

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

:shipit:

@tmat
Copy link
Member

tmat commented Mar 25, 2021

@davidwengier Yup, let's merge.

@davidwengier davidwengier merged commit 90333c8 into dotnet:main Mar 25, 2021
@davidwengier davidwengier deleted the CombineVBandCSharpComparers branch March 25, 2021 23:23
@ghost ghost added this to the Next milestone Mar 25, 2021
333fred added a commit to 333fred/roslyn that referenced this pull request Mar 25, 2021
* upstream/main: (75 commits)
  Split BoundInterpolatedString into BoundInterpolatedString and BoundUnconvertedInterpolatedString (dotnet#52061)
  Combine VB comparers into one, and combine VB and C# comparers together (dotnet#51834)
  Use OptimizedVSCompletionList in LSP scenarios.
  F5 Hot Reload (dotnet#52101)
  Fix typescript shim
  Add tests for lazy syntax trees coming from the GeneratorDriver
  React to code review feedback.
  Simplify the lazy-initalization pattern used in GetRoot
  Remove an unnecessary override. (dotnet#52140)
  Update issue number (dotnet#52130)
  Enable CodeActions support for XAML using its own provider and CodeActionCache. The handlers are actually shared with Roslyn as is. (dotnet#52129)
  Add RestrictedIVT to dotnet watch to Features (dotnet#52087)
  Don't try to highlight operators (dotnet#52041)
  Use `null` instead of empty signature helps in LSP
  Use member type for relational pattern even in error cases (dotnet#51950)
  Update src/VisualStudio/Xaml/Impl/Implementation/LanguageServer/Extensions/SymbolExtensions.cs
  Use new QuickInfoUtilities helper
  Rebuild API shape (dotnet#52079)
  Added position parameter name
  Updated XAML QuickInfo to show more info like C# by using ISymbolDisplayService and adding more documentation parts.
  ...
@333fred 333fred mentioned this pull request Mar 25, 2021
@allisonchou allisonchou modified the milestones: Next, 16.10.P2 Mar 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Combine VB TopSyntaxComparer and StatementSyntaxComparer
3 participants