Merge master to master-vs-deps #39950
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
…rchy This hierarchy today was holding onto an IServiceProvider and also in some cases the package, often to only get MEF services from the IComponentModel. This simplifies it all, and will let us remove more direct coupling from various types.
Now that the AbstractOleCommandTarget directly holds onto an IComponentModel, we can use that rather than fetching it from other places.
This implementation lived in VsLanguageDebugInfo, but wasn't dependent on anything in that, really. Moving this and inlining the code means we can remove the need for an AbstractTextViewFilter to hold onto an AbstractLanguageService which is a problem.
Now that we've removed the dependency, we don't need to pass this around anymore.
There is now nothing in the generic version of AbstractVsTextViewFilter, so we can flatten the two types in the hierarchy.
We don't need to hold onto the entire class just to fetch the GUID, which decouples this nicely.
ContainedLanugage and VenusCommandFilter no longer require generic type parameters, except for the compatibility constructors for TypeScript and LiveShare. This removes the type parameters but leaves in derived types for compatibility.
…rs-and-contained-documents-from-language-service Decouple command filters and contained documents from language service
This is a backport of changes from master-vs-deps
ghost
merged commit
This pull request was closed.
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 master into master-vs-deps.
git fetch --all git checkout merges/master-to-master-vs-deps git reset --hard upstream/master-vs-deps git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-master-vs-deps --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.