SLVS-1746 Change logic so that the diff view window shows all suggested changes that are selectable #5966
Conversation
…om a TextBuffer and to focus a line and that can be reusable.
…select/unselect the changes
gabriela-trutan-sonarsource
requested a review
from georgii-borovinskikh-sonarsource
gabriela-trutan-sonarsource
requested a review
from georgii-borovinskikh-sonarsource
| public void ApplySuggestedChanges() | ||
| { | ||
| Before = textViewEditor.CreateTextBuffer(TextBuffer.CurrentSnapshot.GetText(), TextBuffer.ContentType); | ||
| After = textViewEditor.CreateTextBuffer(TextBuffer.CurrentSnapshot.GetText(), TextBuffer.ContentType); |
There was a problem hiding this comment.
Can we combine create with preview changes below? Aka CreateUpdatedBuffer?
There was a problem hiding this comment.
Why? I think the responsibilities are much clearer this way
| { | ||
| try | ||
| { | ||
| var line = textView.TextBuffer.CurrentSnapshot.GetLineFromLineNumber(lineNumber); |
There was a problem hiding this comment.
DocumentNavigator.Navigate could be reused here. WDYT?
There was a problem hiding this comment.
I would need the SnapshotSpan, which I don't have at this point.
There was a problem hiding this comment.
They're calculated in ApplyChanges in the same class, could cache them probably
There was a problem hiding this comment.
I wouldn't do that. I don't see the advantages
| ///// The changes are applied from bottom to top to avoid changing the line numbers | ||
| ///// of the changes that are below the current change. | ||
| ///// This is important when the change is more lines than the original line range. | ||
| ///// </summary> |
There was a problem hiding this comment.
could create tracking spans for original locations to avoid that?
There was a problem hiding this comment.
This is not a logic that I introduced. I moved it away from the FixSuggestionHandler. If you think it's worth improving that, consider creating another task.
…is applied. Only the After TextBuffer needs to be adapted in this case.
|
gabriela-trutan-sonarsource
merged commit e2bb0cb
into
feature/fix-suggestion-diff
…ed changes that are selectable (#5966)
…ed changes that are selectable (#5966)
SLVS-1746
Show all suggested changes in the same window, where the user can select/unselect the desired changes
The logic has also changed a bit: before my changes, if the file was changed and we could not have an exact match between how the text looks on the machine and what we receive from server that it looked like before, we were showing a goldbar. Now we don't show the goldbar and proceed with the diff view. This behavior is also consistent with the one from Vs Code and IntelliJ.