Skip to content

Merge master to features/param-nullchecking#36231

Merged
2 commits merged intofeatures/param-nullcheckingfrom
merges/master-to-features/param-nullchecking
Jun 7, 2019
Merged

Merge master to features/param-nullchecking#36231
2 commits merged intofeatures/param-nullcheckingfrom
merges/master-to-features/param-nullchecking

Conversation

@dotnet-bot
Copy link
Copy Markdown
Collaborator

This is an automatically generated pull request from master into features/param-nullchecking.
(created from a manual run of the PR generation tool)

git fetch --all
git checkout merges/master-to-features/param-nullchecking
git reset --hard upstream/features/param-nullchecking
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-features/param-nullchecking --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

heejaechang and others added 2 commits June 6, 2019 19:29
this particular code path can take a long time if metadata reference hasn't created its symbols yet.

this can get really bad if we try to show code lens for something like IDispose.Dipose and it tries to create all metdata references in the solution.

since it is not cancellable, just passing by a Dipose method can cause this to occupy CPU 100% for several seconds and there is no way to make it go away.

now we pass in cancellation token so that we can bail out  sooner.
Copy link
Copy Markdown

@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

@ghost ghost merged commit fcde686 into features/param-nullchecking Jun 7, 2019
@ghost ghost deleted the merges/master-to-features/param-nullchecking branch June 7, 2019 04:18
This pull request was closed.
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.

3 participants