Merged
Conversation
…getters/setters (#57856)
Fix FindReference crash in metadata/source inheritance and multi-targetting.
Ports #56131 and updates slightly. I did my best to keep the initial intent of the PR because @Soreloser2 did a great job with it :) From the original PR: Adds support for moving static members to existing types. Searches for types that: Exist within the same project as the original type Are in the same or nested within the same namespace as the original type Example: if we have Ns.Class1 as our original type, then Ns.Class2 and Ns.ExtraNs.Class3 will show, but DifferentNs.Class4 will not Are the same type kind as the original type Will not show interfaces, only shows modules if triggered on a module for VB) Have the same or more restrictive static-ness If the original type is a static class, then it will only show static classes. If the original type is non-static, it will show both static and non-static types (that fit the other criteria) Types will be displayed with their full namespace qualification, any generic type parameters, and their file name (in case of partially declared types) The user can select a pre-defined type using the dropdown menu, or type in a new, separate non-conflicting type to create a new type in a new file. New files will have an icon as well as a preview of the new type name, similar to the previous iteration of this feature. Currently existing types do not have any icon, but this is open to change based on feedback. Co-authored-by: Soren Dahl <43689321+Soreloser2@users.noreply.github.com> Co-authored-by: Joey Robichaud <jorobich@microsoft.com>
Fix crash with embedded lang detection in VB
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
5 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 main into main-vs-deps.
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 -t upstream/merges/main-to-main-vs-deps git reset --hard upstream/main-vs-deps git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-main-vs-deps --force