Merge branch 'master' of github.com:ionide/ionide-vscode-fsharp

Author: cloudRoutine

src/Core/LanguageService.fs

@@ -30,6 +30,10 @@ module LanguageService =
     let request<'a, 'b> ep id  (obj : 'a) =
         if logRequests then Browser.console.log ("[IONIDE-FSAC-REQ]", id, ep, obj)
         ax.post (ep, obj)
+        |> Promise.fail (fun r ->
+            Browser.console.error ("[IONIDE-FSAC-ERR]", id, ep, r)
+            null |> unbox
+        )
         |> Promise.success(fun r ->
             try
                 let res = (r.data |> unbox<string[]>).[id] |> JS.JSON.parse |> unbox<'b>
@@ -41,6 +45,7 @@ module LanguageService =
                 else res
             with
             | ex ->
+                Browser.console.error ("[IONIDE-FSAC-ERR]", id, ep, r, ex)
                 null |> unbox
         )
 
@@ -100,12 +105,21 @@ module LanguageService =
     let compilerLocation () =
         "" |> request (url "compilerlocation")  0
 
-    let start () =
+    let start (onListeningCallback: unit->unit) =
         promise {
             let path = (VSCode.getPluginPath "Ionide.Ionide-fsharp") + "/bin/FsAutoComplete.Suave.exe"
             let child = if Process.isMono () then child_process.spawn("mono", [| path; string port|] |> ResizeArray) else child_process.spawn(path, [| string port|] |> ResizeArray)
             service <- Some child
             child.stderr?on $ ("data", fun n -> Browser.console.error (n.ToString())) |> ignore
+
+            // Wait until FsAC sends the 'listener started' magic string until
+            // we inform the caller that it's ready to accept requests.
+            let x = child.stdout?on $ ("data", fun n ->
+                let isStartedMessage = (n.ToString().Contains(": listener started in"))
+                if isStartedMessage then onListeningCallback()
+                Browser.console.log ("[IONIDE-FSAC-SIG] started message?", isStartedMessage)
+                ()
+            )
             child.stdout?on $ ("data", fun n -> Browser.console.log (n.ToString())) |> ignore
         }
         |> Promise.fail (fun x ->

src/fsharp.fs

@@ -9,28 +9,28 @@ open Fable.Import.vscode
 open Ionide.VSCode.Helpers
 open Ionide.VSCode.FSharp
 
+let internal languageServiceListeningCallback disposables df' =
+    Linter.activate disposables
+    |> Promise.bind(fun _ -> Project.activate ())
+    |> ignore
+
+    Tooltip.activate df' disposables
+    Autocomplete.activate df' disposables
+    ParameterHints.activate df' disposables
+    Definition.activate df' disposables
+    Reference.activate df' disposables
+    Symbols.activate df' disposables
+    Highlights.activate df' disposables
+    Rename.activate df' disposables
+    WorkspaceSymbols.activate df' disposables
+    QuickInfo.activate disposables
+
 let activate(disposables: Disposable[]) =
     let df = createEmpty<DocumentFilter>
     df.language <- Some "fsharp"
     let df' : DocumentSelector = df |> U3.Case2
 
-    LanguageService.start ()
-    |> Promise.success (fun t ->
-        Linter.activate disposables
-        |> Promise.bind(fun _ -> Project.activate ())
-        |> ignore
-
-        Tooltip.activate df' disposables
-        Autocomplete.activate df' disposables
-        ParameterHints.activate df' disposables
-        Definition.activate df' disposables
-        Reference.activate df' disposables
-        Symbols.activate df' disposables
-        Highlights.activate df' disposables
-        Rename.activate df' disposables
-        WorkspaceSymbols.activate df' disposables
-        QuickInfo.activate disposables
-    )
+    LanguageService.start (fun () -> languageServiceListeningCallback disposables df')
     |> ignore
     Forge.activate disposables
     Fsi.activate disposables