Community
Participate
Working Groups
Commit https://git.eclipse.org/r/c/egit/egit/+/32633 added code to GitMergeEditorInput to support linking with the package/project explorer when "Link with Editor" is switched on. This works reasonably well if the merge editor shows a single file (and the left side adapts to IFile). Whenever the editor is activated, the package explorer shows the corresponding resource. (The feature was requested in bug 399598, which is not referenced in the Gerrit change.) However, this has side-effects and doesn't always work. Side-effect: the history view, if set to follow the selection, also updates. Wanted or not? If the comparison includes files not in the Eclipse workspace, the Git history will be replaced by the "Local history", which won't find any local file revisions. Doesn't seem to be very useful. Open a merge editor on several conflicting files. Now following the selection doesn't work always. The CompareEditor's SelectionProvider tracks only the compare viewer (lower pane), not the DiffViewer showing the folder structure top left. But the EGit CompareEditorInput adapts to the selected file in that DiffViewer. These selection changes are picked up reliably only when the CompareEditor is activated. Sometimes they are picked up when a folder is selected, but then the file being shown is the one that was selected before. Just selecting another file in the DiffViewer does not make the package explorer follow (but it will if one activates another view, then the compare editor again). It's also possible to have situations where the CompareEditor shows a comparison of one file, but another file is selected in the DiffViewer (but not shown in the lower pane yet). In this case the package explorer and the history view will show the file selected in the DiffViewer, while the CompareEditor still shows a different comparison. This is all very much inconsistent. I even managed to end up in a state where the commit editor showed a comparison on one file, the package explorer had another file selected, and the history view showed the history of yet another (previously selected in the commit editor) file. Perhaps the adaptation should be changed to not adapt to the file selected in the DiffViewer but to the file actually shown in the lower pane, if any, and use the DiffViewer selection only as a fallback (or not at all).
PackageExplorer react on part activations and on EditorInputChanged events from the active part. A CompareEditor's input is the whole CompareEditorInput. It doesn't change when selections in the DiffTreeViewer change, and it doesn't change when a new file comparison is shown in the lower pane. That explains why the behavior is so erratic with a multi-file comparison. A work-around hack might be to emit fake "input changed" events. But that needs reflection to get at WorkbenchPart.firePropertyChange to be able to call firePropertyChange(IEditorPart.PROP_INPUT). I'd rather drop this whole linking feature for CompareEditors with multiple files. Instead: a CompareEditor can act as an IShowInSource (even though by default the "Show In" menu is not shown anywhere). I think we can actually make this menu appear in the context menu of the DiffTreeViewer, and then the user can control which file he wants to see where and when.
(In reply to Thomas Wolf from comment #1) > Instead: a CompareEditor can act as an IShowInSource (even though by default > the "Show In" menu is not shown anywhere). Minor correction: it is available in the global "Navigate" menu.
New Gerrit change created: https://git.eclipse.org/r/c/egit/egit/+/183148
New Gerrit change created: https://git.eclipse.org/r/c/egit/egit/+/183150
Gerrit change https://git.eclipse.org/r/c/egit/egit/+/183148 was merged to [master]. Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=9f754733fee42b2c80ff2f5bb027ea761130232b
Gerrit change https://git.eclipse.org/r/c/egit/egit/+/183150 was merged to [master]. Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=afd6b45ae9603b7b0f8f238655bf7613e9ab9fef
