Fix interface stub integration

ionide · Jan 29, 2019 · dee80bf · dee80bf
1 parent cdb628f
commit dee80bf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/FsAutoComplete.Core/Commands.fs b/src/FsAutoComplete.Core/Commands.fs
@@ -48,6 +48,7 @@ type CoreResponse =
     | Compile of errors: Microsoft.FSharp.Compiler.SourceCodeServices.FSharpErrorInfo[] * code: int
     | Analyzer of messages: SDK.Message [] * file: string
     | SymbolUseRange of ranges: SymbolCache.SymbolUseRange[]
+    | InterfaceStub of generatedCode: string * insertPosition: pos
 
 [<RequireQualifiedAccess>]
 type NotificationEvent =
@@ -776,14 +777,14 @@ type Commands (serialize : Serializer) =
 
             let! res = tryFindInterfaceExprInBufferAtPos codeGenServer pos doc
             match res with
-            | None -> return [Response.info serialize "Interface at position not found"]
+            | None -> return [CoreResponse.InfoRes "Interface at position not found"]
             | Some interfaceData ->
                 let! stubInfo = handleImplementInterface codeGenServer pos doc lines lineStr interfaceData
 
                 match stubInfo with
                 | Some (insertPosition, generatedCode) ->
-                    return [Response.interfaceStub serialize generatedCode insertPosition]
-                | None -> return [Response.info serialize "Interface at position not found"]
+                    return [CoreResponse.InterfaceStub (generatedCode, insertPosition)]
+                | None -> return [CoreResponse.InfoRes "Interface at position not found"]
         } |> x.AsCancellable (Path.GetFullPath tyRes.FileName)
 
     member x.WorkspacePeek (dir: string) (deep: int) (excludedDirs: string list) = async {

diff --git a/src/FsAutoComplete/AssemblyInfo.fs b/src/FsAutoComplete/AssemblyInfo.fs
@@ -7,7 +7,7 @@ open System.Reflection
 [<assembly: AssemblyDescriptionAttribute("A command line tool for interfacing with FSharp.Compiler.Service over a pipe.")>]
 [<assembly: AssemblyVersionAttribute("0.34.0")>]
 [<assembly: AssemblyFileVersionAttribute("0.34.0")>]
-[<assembly: AssemblyMetadataAttribute("githash","439f786b27c2d5fc9f6f956f8097b5cd76e4224f")>]
+[<assembly: AssemblyMetadataAttribute("githash","cdb628f6113ff9587716fadcbff83588a7342d38")>]
 do ()
 
 module internal AssemblyVersionInformation =
@@ -16,4 +16,4 @@ module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyDescription = "A command line tool for interfacing with FSharp.Compiler.Service over a pipe."
     let [<Literal>] AssemblyVersion = "0.34.0"
     let [<Literal>] AssemblyFileVersion = "0.34.0"
-    let [<Literal>] AssemblyMetadata_githash = "439f786b27c2d5fc9f6f956f8097b5cd76e4224f"
+    let [<Literal>] AssemblyMetadata_githash = "cdb628f6113ff9587716fadcbff83588a7342d38"
diff --git a/src/FsAutoComplete/CommandResponse.fs b/src/FsAutoComplete/CommandResponse.fs
@@ -791,3 +791,5 @@ module CommandResponse =
       analyzer s (messages, file)
     | CoreResponse.SymbolUseRange(ranges) ->
       symbolUseRange s ranges
+    | CoreResponse.InterfaceStub(generatedCode, insertPosition) ->
+      interfaceStub s generatedCode insertPosition