Fix Bug: RemoveAndSortUsings #727
Conversation
Prevent duplicate using statements from being re-added.
| } | ||
|
|
||
| // Now sort without removing to ensure correct ordering. | ||
| _commandHelper.ExecuteCommand(textDocument, "Edit.SortUsings"); |
There was a problem hiding this comment.
This will cause the usings to be sorted twice for newer versions of the IDE, even for the default case where the using statements to re-insert do not exist. I can see why it is split out to happen after re-insertion, but I think it should be guarded to avoid extra work.
There was a problem hiding this comment.
Good catch. I'll update code to skip that work if there are no reinsert candidates.
| .Where(usingStatement => TextDocumentHelper.FirstOrDefaultMatch(textDocument, string.Format(patternFormat, usingStatement)) == null) | ||
| .ToList(); | ||
|
|
||
| ThreadHelper.ThrowIfNotOnUIThread(); |
There was a problem hiding this comment.
| ThreadHelper.ThrowIfNotOnUIThread(); |
Although the IDE provides warnings about this, in general I've found we can invoke on background threads and boost performance.
There was a problem hiding this comment.
Ah, that makes sense. I'll remove it.
| { | ||
| point.editPoint.CharRight(); | ||
| } | ||
| var usingStatementsToReinsert = _usingStatementsToReinsertWhenRemoved.Value |
There was a problem hiding this comment.
Previously I was trying to capture and re-insert text back where it was originally located. This helped with some custom sort rules that users had. I agree it may not be necessary anymore since newer versions of VS have merged remove and sort back together vs. being separate options. Thanks for simplifying the code. 👍
There was a problem hiding this comment.
That makes sense, no problem.
|
Thanks for getting back to me. I made changes based on your comments. Let me know if you need any other adjustments. |
|
Thanks again for putting this together and apologies for my delay in accepting it. This looks great and ran well on my machine so I'm glad to merge it! :) This bit of functionality has historically been a bit rough so I'm particularly excited to have it improved. <3 |
|
Happy to help, I look forward to the next update! |
Prevent duplicate using statements from being re-added.
This is somewhat related to #659, but I didn't see a bug describing this exact situation.
I'm including repro steps. Let me know if you would like me to move that out to a separate issue.
Visual Studio 2019 express. Windows 10.
Expected: Includes all referenced usings, and at most one instance of each using in CodeMaid options.
Actual: Reorders usings and adds duplicates.
RemoveAndSortUsings Bug Example.zip