Added new config to keep the same line when switching between diffEditors #155395
Conversation
|
Also, I don't think we need a config for this. I don't see a reason why you would not want the cursors to be synchronized. |
|
The current implementation jumps to the last focused line, I see it potentially useful for merge conflicts. Maybe we can keep the config but instead of a boolean we can explicit the "strategy" that would be either |
Balastrong
force-pushed
the
feature/155036-sync-curson-on-compare-editor-focus
branch
from
a062f57 to
0e054c6
Compare
|
|
||
| const configurationService = accessor.get(IConfigurationService); | ||
| const keepLine = configurationService.getValue<boolean>('diffEditor.keepLine'); | ||
|
|
||
| if (keepLine && source) { | ||
| const position = source.getPosition(); | ||
|
|
||
| if (position) { | ||
| const equivalentLineNumber = mode === FocusTextDiffEditorMode.Original ? | ||
| control.getDiffLineInformationForModified(position.lineNumber)?.equivalentLineNumber : | ||
| control.getDiffLineInformationForOriginal(position.lineNumber)?.equivalentLineNumber; | ||
|
|
||
| if (equivalentLineNumber !== undefined) { | ||
| destination.setPosition(new Position(equivalentLineNumber, position.column)); | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Can you make this code nicer? It is very deeply nested. Maybe a function with early returns makes sense here.
There was a problem hiding this comment.
Oh wow, you're absolutely right, that nesting is terrible!
I updated the branch now, thanks for pointing it out!
|
@hediet @Balastrong Hello! I stumbled upon this PR when trying to figure out if it's possible to sync the cursor between diff panels today. Is this PR still expected to be merged? Is there any help needed? It would be shame to leave it like this, unless there's already a different way to do it. |
|
I made an extension kinda same to this. |
This PR fixes #155036.
Added a new boolean config
diffEditor.keepLine.If enabled, switching between diffEditors with a command (
workbench.action.compareEditor.focusPrimarySide,workbench.action.compareEditor.focusSecondarySide,workbench.action.compareEditor.focusOtherSide) will keep the cursor on the same line.