Merge main to features/rename_ui_rework #58362
Merged
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
…o merges/master-to-features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…o merges/master-to-features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…features/param-nullchecking
…atures/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
…-nullchecking Merge master to features/param-nullchecking
The unit tests were testing against a special mock of VisualStudioWorkspace, which meant the "real" implementation of GetFileCodeModel wasn't being used, but instead requests for code model would just go through a lookup into a dictionary. This commit moves the MockVisualStudioWorkspace to inherit from VisualStudioWorkspaceImpl where the actual implementation lies, and then generally cleans up this area to create things via MEF rather than via direct calls to constructors of some MEF-produced types.
This returns a ProjectItem from the project system for a file, but in the case of source generated files we won't be able to do that since they're not represented by anything the project system knows about. Coincidently, our unit tests always have been passing null the whole time so this is something more or less we need to deal with regardless.
Some designers look through the other partial parts of a class to look for methods that match event handler signatures. Here I'm adding limited support so you can get a FileCodeModel and CodeElement for things residing in source generated files. Unlike regular FileCodeModels that have certain lifetime guarantees and use our COM weak handle magic, this is keeping the implementation simple and just returning a new FileCodeModel any time we need one, under the hopes that the uses of this are rare. If that becomes a problem, we can refactor the CodeModel cache to deal with these, but there is some complexity around when we precisely know the document has gone away. Since CodeModel is very much a legacy API I don't want to spend time adding complexity until we know we need it. This also doesn't implement any support for raising change events if a generator output changes. Again, if that is needed we can update the diffing code accordingly.
Improve usability of "enable nullable reference types" refactoring
Merge param-nullchecking to main
[main] Update dependencies from dotnet/arcade
Fix failure to propagate cancellation token
…generated-documents-in-codemodel Support CodeClass2.Parts returning parts in source generated files
Swithc to acquiring the component model on a BG thread.
This was referenced Dec 16, 2021
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 main into features/rename_ui_rework.
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-features/rename_ui_rework git reset --hard upstream/features/rename_ui_rework git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/rename_ui_rework --force