Merge dev15.8 to dev16.0 #5124
Merged
Merge dev15.8 to dev16.0 #5124
Conversation
This file contains hidden or 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
Merge master to dev15.8
Merge dev15.7 to dev15.8
* Found a workaround for the heavy code lens bug. Merged master into the branch. Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Fixes a deadlock due to context changes + started removing mutex. This is from yesterday! Review is NOT applied yet! Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Small fixes, applied a part of the reviews The UI is still buggy. This is very annoying. @saul I should report the bug you read about in my comments. . . Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Fixed CodeLens layout updates. Added possibility to enforce a re-layout of the visible code lens for the next layout-changed call. Applied suggestions from the reviews (could be that I missed one or two). Small cleanup. Small documentation additions. More checks. Removed some debug code. Added some debug code, most only appears if exceptions are thrown. The caching is still a small bit broken. At least I found out it's only a bit broken. Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Fixing removal of Code Lens. Reuse of elements still needs to be finished. I started it months ago but didn't finish it. Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Fixing fatal UI logic. Finally activated code for using cache results (so fixed a bug which included that code lens could be lost for us). Small cleanup to reduce confusion and decreased chance of introducing bugs due to this. Changing TaggerProvider to a more appropriate one. Discovered bugs in the visitor logic. * Added Line-Lens Added Options page to disable Code-Lens and to switch between Code-Lens and Line-Lens More caching fixes. Minimal UI fixes Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Fixed caching completely. Also fixed with this UI issues. Big cleanup. Now it's ready for another round of reviews! Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Added prefix option Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Fixing bug reported by Vasily Fixing cache bug. Fixing ui-offset bug. Fixing multi-view bug. Fixing build. Fixing signature bug reported by @saul Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Fixing KeyNotFoundException. Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Another UI fix. Code Lens are now hidden as soon as their line isn't visible anymore due to inserting new lines. Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Applied some review comments. Heavy performance improvements, now layouting isn't done every time due to that Visual Studio just transforms everything together (it's not viewport relative anymore, it's owner controlled but still in the wpf-text-view-coordinate-system)! The UI should now be fine in my opinion. It wasn't able for me to find a better workaround as just subtracting one pixel from the top position of the adornments. Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Another round of small cleanup. Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Another UI layout fix. Now weird code lens anymore :P Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Fixing merge * start working on color option * use darker gray à la normal CodeLens * Bind only from XAML. Fixes issue where "prefix" option was not saved * Undo unintended whitespace change * Should be part of previous commit * start working on color option * use darker gray à la normal CodeLens * Undo unintended whitespace change * Should be part of previous commit * fix value names * Applied review + small workaround for a bug. Merry Christmas! Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * Removed old files * trying to fix CI Signed-off-by: realvictorprm <mueller.vpr@gmail.com> * First fix for member and constructor signatures! Signed-off-by: realvictorprm <mueller.vpr@gmail.com>
Merge dev15.7 to dev15.8
Merge master to dev15.8
Merge dev15.7 to dev15.8
Merge dev15.7 to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge dev15.7 to dev15.8
Merge dev15.7 to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge dev15.7 to dev15.8
Merge dev15.7 to dev15.8
Merge dev15.7 to dev15.8
Merge master to dev15.8
Merge dev15.7 to dev15.8
Merge dev15.7 to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge dev15.7 to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge master to dev15.8
[dev15.7] Fix annotation view regression
* Update README.md * Update README.md * Update README.md * [RFCs FS-1051, FS-1052, FS-1053] support for span, readonly refs, byref-like structs (#4888) * initial support for span, readonly refs, byref-like structs * fix proto build * make proto work with previous FSharp.Core * make proto work with previous FSharp.Core * update baselines * integrate code cleanup * integrate code cleanup * integrate code cleanup * integrate code cleanup * fix build * fix build * implicit deref of byref returns * add tests for Memory, ReadOnlySpan and ReadOnlyMemory * fix tests * simplify diff * simplify diff * remove duplicate error messages * fix build * test updates * fix build * fix build * update baselines * fix uses of NativePtr.toByRef * switch to inference using byref pointer capabilities * fix proto build * update baselines, byref extension methods * fix test errors * emit in,out,modreq attributes correctly * update tests * fix build * fix build * fix tests * fix tests * get it right silly boy * fix test * minor cleanup * add more tests * clarify overloading behaviour + test case * fix build break * fix build of tests * update tests * add more tests * byref fixes * updates for subsumption calls, error message, assign-to-return-byref * test updates, implicit deref on byref return for normal functions * update baseline * improve debug formatting, better error message on implicit deref, improve error messages * add more tests for recursive functions * update baselines * fix baselines * updates for new test cases * updates for new test cases * test updates and byref-to-byreflike * deal with 'M() <- expr' * restrict addresses of immutable top-level things * fix IsByRefLike on struct * update tests * fix test * fix test * improve check for no-return-of-struct-field-addresses * fix test case * Provide fast generic comparer for bool values (#5076) * provide fast generic comparer for bool values * formatting * no completion on name of value and function declaration (#5083) * LOC CHECKIN | Microsoft/visualfsharp master | 20180604 | Termchange (#5082) * fix merge
Cherry-pick type provider fixes to 15.7
Merge master to dev15.8
Merge dev15.7 to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge master to dev15.8
Merge master to dev15.8
brettfo
suggested changes
Jun 6, 2018
There was a problem hiding this comment.
PR checks have not properly completed. The steps required are:
- Enable CI on
dev16.0branch by merging dotnet/dotnet-ci#1013. - Re-test this PR.
brettfo
approved these changes
Jun 7, 2018
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.
This is an automatically generated pull request from dev15.8 into dev16.0.
git fetch --all git checkout merges/dev15.8-to-dev16.0 git reset --hard upstream/dev16.0 git merge upstream/dev15.8 # Fix merge conflicts git commit git push merges/dev15.8-to-dev16.0 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.