Merge main to main-vs-deps #53666
Merged
Merge main to main-vs-deps #53666
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
Add tests for underlining reassignments
Correctly disable OK button in pull members dialog
* Move IEditorFormattingService to the Features layer Today, IEditorFormattingService lives in the EditorFeatures layer, which is an impediment to making the API public and to making our LSP depend only on the Features layer. This moves the service down to the Features layer. The service was almost entirely independent of the EditorFeatures layer today, with one exception: it used [Microsoft.VisualStudio.TextEditor.IIndentationManager.GetIndentation](https://docs.microsoft.com/en-us/dotnet/api/microsoft.visualstudio.text.editor.iindentationmanagerservice.getindentation?view=visualstudiosdk-2019#Microsoft_VisualStudio_Text_Editor_IIndentationManagerService_GetIndentation_Microsoft_VisualStudio_Text_ITextBuffer_System_Boolean_System_Boolean__System_Int32__System_Int32__), which of course cannot be directly moved to the Features layer. I extracted the extension method that called this into it's own workspace service, with a no-op implementation in the Workspace layer, and a VS-specific implementation in the EditorFeatures layer that overrides the no-op version and calls the VS-specific API. The API is also renamed to `IFormattingInteractionService`, and the returns are changed to be `ImmutableArray`, rather than `IReadOnlyList`. Co-authored-by: Sam Harwell <Sam.Harwell@microsoft.com>
Move language version check for syntax node action to compilation start
AddAccessibilityModifiers: record struct support
Move initial part of LSP loading off the UI thread.
Add ability to underline variables in the editor that are reassigned.
ghost
merged commit 
ghost
added this to the 
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 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 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