cleanup shutdown

model.fs

@@ -119,8 +119,8 @@ module ModelImpl =
         ignore <| nvim.grid_resize gridui.Id gridui.GridWidth gridui.GridHeight
 
 let Detach() =
-    nvim.stop(0)
-    states.Shutdown(0)
+    if nvim.isRemote then
+      states.Shutdown(0)
 
 let UpdateUICapabilities() =
     let opts = hashmap[]

neovim.fs

@@ -23,10 +23,10 @@ open System.Runtime.InteropServices
 let inline private trace fmt = trace "neovim.process" fmt
 
 let private default_notify (e: Request) =
-    failwithf "%A" e
+  task { return () }
 
 let private default_call (e: Request) =
-    failwithf "%A" e
+  task { return {result=Result.Error(box "not connected")} }
 
 type NvimIO =
     | Disconnected
@@ -43,7 +43,7 @@ type Nvim() as nvim =
     let mutable m_events      = None
     let mutable m_io          = Disconnected
     let mutable m_disposables = []
-    let m_cancelSrc           = new CancellationTokenSource()
+    let mutable m_cancelSrc   = Unchecked.defaultof<CancellationTokenSource>
 
     member __.Id = Guid.NewGuid()
 
@@ -97,6 +97,7 @@ type Nvim() as nvim =
         | Disconnected, None -> ()
         | _ -> failwith "neovim: already started"
 
+        m_cancelSrc <- new CancellationTokenSource()
         let io = nvim.createIO opts
 
         let serverExitCode() =
@@ -254,6 +255,12 @@ type Nvim() as nvim =
 
     member __.stop (timeout: int) =
 
+        match m_io with
+        | Disconnected -> ()
+        | _ ->
+
+        trace "stopping"
+
         // Send cancellation signal
         m_cancelSrc.Cancel()
         m_cancelSrc.Dispose()
@@ -275,6 +282,7 @@ type Nvim() as nvim =
             stream.Dispose()
         | Disconnected -> ()
 
+        m_cancelSrc <- null
         m_io <- Disconnected
         m_events <- None
         m_notify <- default_notify

states.fs

@@ -246,7 +246,9 @@ let backgroundCompositionToString =
     | Acrylic -> "acrylic"
     | Transparent -> "transparent" 
 
-let Shutdown code = _appLifetime.Value.Shutdown code
+let Shutdown code = 
+  try _appLifetime.Value.Shutdown code
+  with _ -> ()
 
 let get_crash_info() =
   _crashcode, _errormsgs
@@ -274,7 +276,7 @@ let msg_dispatch =
       _errormsgs.Add err
     | Exit -> 
       trace "rpc" "shutting down application lifetime"
-      _appLifetime.Value.Shutdown()
+      Shutdown 0
     | Crash code -> 
       trace "rpc" "neovim crashed with code %d" code
       _crashcode <- code