Merge master to features/embeddedRegex#27516
Merged
2 commits merged intofeatures/embeddedRegexfrom Jun 6, 2018
Merged
Conversation
* remove usings when format document * sort usings when format document * add code fix * hack fix for the issue with apply multiple changes. * refactoring * 3 changes 1. put open file editorconfig change tracking back 2. handle open file leaking when solution close with files opened case 3. don't share locks between editorconfig events and roslyn events * skip the 'Remove unused variable' when format document * changed code fix part to use "fix all" and only fixes P1 list rather than fix everything in the document. also not apply changes to buffer until everything is done rather than doing it per fix. * made undo experience better * add expression body as one of fix to offer * add code fix options in format document settings * add hidden box IsCodeCleanupConfiguredCheckBox to track if the user ever configured the code cleanup * clean up * fix some tests * disable a test temporarily * PR comments * refactoring * Revert "3 changes" This reverts commit 7e0fd53. * PR comments * PR comments * renaming * bug fixing * PR comments * refactoring * refactoring * refactoring * refactoring * Make ICodeCleanupService extend ILanguageService * refactoring * refactoring * fix deadlock, call Format inside CodeCleanupService * rename async methods * PR comments * move files under features * PR comments * PR comments * Never Show this again will never show the code cleanup info bar for this user. * rename * use ImmutableArray
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
2 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/embeddedRegex.
git fetch --all git checkout merges/master-to-features/embeddedRegex git reset --hard upstream/features/embeddedRegex git merge upstream/master # Fix merge conflicts git commit git push merges/master-to-features/embeddedRegex --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.