Keep current version and reload about file-watcher HOT 6 CLOSED

Hi @kankaristo thanks for trying this out.

I believe that this is already possible if you select Ignore on the prompt that appears if you have local changes. If you select Ignore I do not reload the file from disk. You are then able to save over the disk changes from atom, or save it as a separate file as normal.

Is this not working for you?

from file-watcher.

Yes, that's working. My description is a bit convoluted, sorry about that. 😊

I meant that it would be nice to open the 2 different versions into separate tabs automatically. So the dialog would have 3 options: "Ignore", "Open both", "Reload (overwrite buffer)".

This way you could compare the 2 versions side by side, without having to save a "temporary" version to a second file.

from file-watcher.

Ah I see what you mean. That sounds like a good feature, I'll work it into the next release..

from file-watcher.

Added in version 0.3.0

from file-watcher.

Fantastic! 👍

A small improvement; set the grammar (syntax highlighting, autocomplete, etc.) for the unsaved file:

 confirmReload: ->
     currPath = @editor.getPath()
     currEncoding = @editor.getBuffer()?.encoding || 'utf8'
+    currGrammar = @editor.getGrammar()

     choice = atom.confirm
       message: path.basename(currPath) + ' has changed on disk.'
       buttons: ['Reload', 'Compare', 'Ignore']

     return if choice is 2

     if choice is 0
       @editor.getBuffer()?.reload()
       return

     compPromise = atom.workspace.open null,
       split: 'right'

     compPromise.then (ed) ->
       ed.insertText fs.readFileSync(currPath, encoding: currEncoding)
+      ed.setGrammar currGrammar

from file-watcher.

Nice! ✔️
Added, patched and credited.

from file-watcher.