Yeah, I forgot that refactoring might also trigger a file rename operation and then we have competing listeners. I should probably install some mergeWindow for this particular case even when the history sources differ.

@karrtikr qq: how did you trigger that refactoring?

I simply renamed the file via the file explorer. The file was renamed and saved automatically. But then I pressed CTRL+S to save again. That triggered the second entry.

This was a bit complicate to fix, but here is what we do:

• when you save an editor, we check if we previously had added a history entry for the content version of the editor to prevent adding history entries over and over for each save you press
• the content version of an editor is just a counter that increments each time the content of an editor changes
• in this case this check fails because the entry that is added to history from the rename operation does not originate from a normal save of the editor but from a rename in the file explorer
• the fix is to handle the file rename similar to a save and record the content version at the time of the rename so that when you hit save again after rename and the content version did not change, the history entry is ignored

Verification:

• test the steps as outlined above
• also test that when you modify the file again after rename and save, the history entry appears as normal

Yep seems to be working now.