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

Fix parsing routines lost in merges #11031

Merged
merged 1 commit into from
Feb 6, 2021

Conversation

cartermp
Copy link
Contributor

@cartermp cartermp commented Feb 6, 2021

There was a sequence of events that damned the repo for a day:

  1. I submitted Address several (most?) cases of correctly triggering F# function application signature help in some nested contexts #10961 a while back, with added tests (that passed)
  2. @dsyme submitted FCS namespace revamp #10971. This was ultimately merged Wednesday night / Thursday morning (depending on your time zone
  3. Merges, branches, possible conflicts, etc. were resolved.
  4. Address several (most?) cases of correctly triggering F# function application signature help in some nested contexts #10961 was merged this morning (tests passed, after all!)
  5. Merges, branches, possible conflicts, etc. were resolved.
  6. main was busted, since tests added in Address several (most?) cases of correctly triggering F# function application signature help in some nested contexts #10961 did not have the accompanying implementation that makes them pass in main!

This simply adds back the correct changes from #10961 so that tests pass again.

@KevinRansom
Copy link
Member

Thank you Phillip

@KevinRansom KevinRansom merged commit 4a6552d into dotnet:main Feb 6, 2021
@cartermp cartermp deleted the fix-stuff-lost-in-merge branch February 6, 2021 04:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants