Add --keep flag

- This commit will keep our Rust implementation and that of official
  Ruby implementation in sync.

src/main.rs

@@ -62,7 +62,7 @@ fn main() -> Result<(), String> {
     let buffers = file_handler::get_requested_buffers(&settings)?;
     // Send the files to remote editor
     // let buffers = remote_editor::open_file_in_remote(&socket, buffers)?;
-    remote_editor::open_file_in_remote(&socket, &buffers)?;
+    remote_editor::open_file_in_remote(&socket, &buffers, &settings)?;
 
     // If needed, fork so we yield the control back to terminal
     if !settings.wait && run_fork()? {

src/remote_editor.rs

@@ -56,6 +56,7 @@ pub(crate) fn close_buffer(
 pub(crate) fn open_file_in_remote(
     socket: &socket2::Socket,
     buffers: &HashMap<String, settings::OpenedBuffer>,
+    settings: &settings::Settings,
 ) -> Result<(), String> {
     // ) -> Result<HashMap<String, settings::OpenedBuffer>, String> {
     let bsize = socket.recv_buffer_size().map_err(|e| e.to_string())?;
@@ -77,13 +78,14 @@ pub(crate) fn open_file_in_remote(
                     "open\ndisplay-name: {}\n",
                     "real-path: {}\n",
                     "selection: {}\n",
-                    "data-on-save: yes\nre-activate: yes\n",
+                    "data-on-save: yes\nre-activate: {}\n",
                     "token: {}\n",
                 ),
                 // host_name.to_string_lossy(),
                 opened_buffer.display_name.to_string_lossy(),
                 opened_buffer.canon_path.to_string_lossy(),
                 opened_buffer.line,
+                if settings.keep { "yes" } else { "no" },
                 token
             );
             trace!("header: {}", header);

src/settings.rs

@@ -31,6 +31,10 @@ pub(crate) struct Settings {
     #[structopt(short, long, env = "RMATE_PORT", min_values = 1)]
     pub port: Option<u16>,
 
+    /// Have TextMate retain window focus after file is closed
+    #[structopt(short, long)]
+    pub keep: bool,
+
     /// Wait for file to be closed by TextMate/Sublime Text
     #[structopt(short, long)]
     pub wait: bool,