Skip to content

Merge master to features/param-nullchecking#36558

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

Merge master to features/param-nullchecking#36558
11 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.

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.

avodovnik and others added 11 commits June 3, 2019 09:57
…ullability

I added a test to ensure the inferrer no longer crashes, but
#36046 still blocks the ability
for it to actually pass. The test is then added skipped until that
works.
We had two overloads of AbstractSymbolCompletionProvider.CreateItems,
once which handles the case of a single file and one that handles
linked files. The code is almost identical, but the linked file one
incorrectly handled the case of not having any symbols. Rather than
fixing the bug in just that branch, I'm refactoring it to simply
remove the second copy so both the single file and linked file cases
go through the same helper. The intent here is to avoid hiding simple
bugs that had nothing to do with linked files in the linked-file-only
path.

Fixes #36080 by virtue of
deleting the offending code entirely. No new tests are added since
I've confirmed that the existing tests (once the refactoring was
complete) would have been sufficient for discovering this problem.
Fix #36060: Group Completion Providers using IsExclusive
…with-method-inference

Fix crash where type inference doing method inference needs to drop nullability
…-fatal-watson

Remove duplication in AbstractSymbolCompletionProvider.CreateItems
@JoeRobich
Copy link
Copy Markdown
Member

CI
Integration CI

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 fa959cd into features/param-nullchecking Jun 19, 2019
@ghost ghost deleted the merges/master-to-features/param-nullchecking branch June 19, 2019 01:30
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.

7 participants