Merge master to features/interpolated-string-constants#48300
Merged
910 commits merged intofeatures/interpolated-string-constantsfrom Oct 13, 2020
Merged
Conversation
|
Hello @dotnet-bot! Because this pull request has the Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 12 minutes. No worries though, I will be back when the time is right! 😉 p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
Member
|
@333fred |
9143f21 to
fd5820a
Compare
Member
|
Wait what, how did I close this |
Co-authored-by: Fred Silberberg <frsilb@microsoft.com>
- This is an interesting issue because the VS LSP platform violates the LSP spec whereas Razor does not violate the spec and translates VS LSP platform requests into spec abiding messages; however, this in turn breaks Roslyn. So for instance, when typing an identifier to trigger completion the trigger kind should be `invoked` and the trigger character should be `null`; however, the LSP platform passes `CompletionTriggerKind.TriggerCharacter` and either a `\0` trigger character or the actual identifier. Because of this difference in behavior prior to this change you'd run `char.Parse` on `null` which would of course explode.
#47047 changed the logic for the file name and path we generate, but we were no longer ensuring the temporary directory existed prior to trying to create the file within it.
IServiceBroker requires the UI thread to initialize a ServiceHub service if it is not already loaded before GetProxyAsync is called. This change loads GlobalHubClientPackage as part of WaitUntilFullyLoadedAsync to ensure this condition is met.
Remove infra for legacy OptProf
Pass along option to diagnostic analyzer.
Make sure GlobalHubClientPackage is loaded
Switch to immutable arrays.
Expand inline hints to type-locations
Update PreRelease version for Preview 5
…012.2 (#48513) [master] Update dependencies from dotnet/roslyn
Remove C#/VB dependency on inline hints.
…f-source-generated-file Fix Go to Definition to a source-generated file
Fix graph query for records
Co-authored-by: Youssef Victor <31348972+Youssef1313@users.noreply.github.com>
* Fix usage fo FatalError.Report* * update handlers in VS and OOP to never fail-fast * Replace ReportWithoutCrashAndPropagate with Report. Both APIs propagate the exception. With the previous change ReportWithoutCrash now does not crash VS/OOP.
Hook up doc links to IDExxxx rules
Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
Add contributing doc for IDE code style analyzer documentation
Make db lock static to investigate issue.
Merge release/dev16.8 to master
Merge release/dev16.8 to master
…features/interpolated-string-constants * upstream/master: (295 commits) Update F1 Keywords to differentiate between semantics of default keyword (#48500) Default constructor suggestion between members (#48318) (#48503) Adjust ERR_PartialMisplaced diagnostic message (#48524) Refactor ChangedText.Merge and add fuzz testing (#48420) Apply suggestions from code review Do not crash on unexpected exception (#48367) Reference the contributing doc in 'Analyzer Suggestion' issue template Apply suggestions from code review Hardcode skipped Regex diagnostic ID as it is not available in CodeStyle layer Add using Skip help link for Regex diagnostic analyzer Add contributing doc for IDE code style analyzer documentation Make db lock static to investigate issue. Update dependencies from https://github.com/dotnet/roslyn build 20201012.2 (#48513) Hook up help link even for AbstractCodeQualityDiagnosticAnalyzer Add destructor intellisense test for record (#48297) Remove unused method (#48429) Fix bug Update src/EditorFeatures/Core.Wpf/InlineHints/InlineHintsTag.cs Add more test ...
This pull request was closed.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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 master into features/interpolated-string-constants.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout merges/master-to-features/interpolated-string-constants git reset --hard upstream/features/interpolated-string-constants git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-features/interpolated-string-constants --force