Merge Features/quick info party into master-vs-deps #26003
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…o QuickInfoAPI2
…hitespace(...) extension method
Use modern Tooltips API
Quick info merge master vs deps
README.md
Outdated
| @@ -7,17 +7,15 @@ | |||
| |:--:|:--:|:--:|:--:|:--:|:--:|:--:|:--:| | |||
| |**master**|[](https://ci.dot.net/job/dotnet_roslyn/job/master/job/windows_debug_unit32/)|[](https://ci.dot.net/job/dotnet_roslyn/job/master/job/windows_debug_unit64/)|[](https://ci.dot.net/job/dotnet_roslyn/job/master/job/windows_release_unit32/)|[](https://ci.dot.net/job/dotnet_roslyn/job/master/job/windows_release_unit64/)|[](https://ci.dot.net/job/dotnet_roslyn/job/master/job/windows_determinism/)|[](https://ci.dot.net/job/dotnet_roslyn/job/master/job/windows_debug_vs-integration/)|[](https://ci.dot.net/job/dotnet_roslyn/job/master/job/windows_release_vs-integration/)| | |||
| |**dev15.0.x**|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.0.x/job/windows_debug_unit32/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.0.x/job/windows_debug_unit64/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.0.x/job/windows_release_unit32/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.0.x/job/windows_release_unit64/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.0.x/job/windows_determinism/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.0.x/job/windows_debug_vs-integration/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.0.x/job/windows_release_vs-integration/)| | |||
| |**dev15.5.x**|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.5.x/job/windows_debug_unit32/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.5.x/job/windows_debug_unit64/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.5.x/job/windows_release_unit32/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.5.x/job/windows_release_unit64/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.5.x/job/windows_determinism/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.5.x/job/windows_debug_vs-integration/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.5.x/job/windows_release_vs-integration/)| | |||
| |**dev15.6.x**|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.6.x/job/windows_debug_unit32/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.6.x/job/windows_debug_unit64/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.6.x/job/windows_release_unit32/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.6.x/job/windows_release_unit64/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.6.x/job/windows_determinism/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.6.x/job/windows_debug_vs-integration/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.6.x/job/windows_release_vs-integration/)| | |||
| |**dev15.3.x**|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.3.x/job/windows_debug_unit32/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.3.x/job/windows_debug_unit64/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.3.x/job/windows_release_unit32/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.3.x/job/windows_release_unit64/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.3.x/job/windows_determinism/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.3.x/job/windows_debug_vs-integration/)|[](https://ci.dot.net/job/dotnet_roslyn/job/dev15.3.x/job/windows_release_vs-integration/)| | |||
There was a problem hiding this comment.
This looks very suspicious. 😄
There was a problem hiding this comment.
I probably resolved the merge conflict wrong, let me revert it
JieCarolHu
force-pushed
the
features/quick-info-party
branch
from
4566938 to
3adc994
Compare
JieCarolHu
force-pushed
the
features/quick-info-party
branch
from
ba0245d to
f04559a
Compare
|
@jasonmalinowski Could you please approve this change? Thanks |
jasonmalinowski
approved these changes
Apr 20, 2018
There was a problem hiding this comment.
I've reviewed the overall payload and this looks like the right set of files/diffs. I didn't review each file of course since that's already happened.
Before we merge this let's make sure that:
- Integration tests are passing.
- @KirillOsenkov has confirmed this is a payload they can take for VS for Mac.
Also, please make sure we merge this with a regular merge a not a squash merge. Wouldn't want to lose all the history here.
|
Also FYI to @Pilchie I think since we'll kinda want ask mode approval on this. |
|
I didn't review the changes but I'm guessing this is fine for VSMac. We are planning to adopt the new Quick Info API in 15.8. |
DustinCampbell
approved these changes
Apr 23, 2018
| @@ -489,7 +489,6 @@ private static Document GetDocumentToVerify(DocumentId expectedChangedDocumentId | |||
| int index, ImmutableArray<CodeAction> actions, CodeActionPriority? priority = null) | |||
| { | |||
| Assert.NotNull(actions); | |||
| Assert.NotEmpty(actions); | |||
There was a problem hiding this comment.
What is this change and how is it related to Quick Info work?
There was a problem hiding this comment.
reverted. the change was accidentally got in when I was switching branches...
|
Approved to merge for 15.8.preview2 |
|
w00t!!! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge Features/quick info party into master-vs-deps
Customer scenario
The changes are already reviewed in the following PRs
#20554
#25181
#25484
#25975
Bugs this fixes
#24094
#24956
#24434
#25608
Workarounds, if any
Also, why we think they are insufficient for RC vs. RC2, RC3, or RTW
Risk
This is generally a measure our how central the affected code is to adjacent
scenarios and thus how likely your fix is to destabilize a broader area of code
Performance impact
(with a brief justification for that assessment (e.g. "Low perf impact because no extra allocations/no complexity changes" vs. "Low")
Is this a regression from a previous update?
Root cause analysis
How did we miss it? What tests are we adding to guard against it in the future?
How was the bug found?
(E.g. customer reported it vs. ad hoc testing)
Test documentation updated?
If this is a new non-compiler feature or a significant improvement to an existing feature, update https://github.com/dotnet/roslyn/wiki/Manual-Testing once you know which release it is targeting.