Merge pull request #282 from 7sharp9/updateOnEvaluation

Update OnEvaluation event to have FSharpSymbolUse information available

Author: fsgit

src/fsharp/fsi/fsi.fs

@@ -149,12 +149,11 @@ type internal FsiValuePrinterMode =
     | PrintExpr 
     | PrintDecl
 
-type EvaluationEventArgs(name : string, displaycontext : FSharpDisplayContext, range : range, fsivalue : FsiValue) =
+type EvaluationEventArgs(name : string, fsivalue : FsiValue, symbolUse : FSharpSymbolUse) =
     inherit EventArgs()
     member x.Name = name
-    member x.DisplayContext = displaycontext
-    member x.Range = range
     member x.FsiValue = fsivalue
+    member x.SymbolUse = symbolUse
 
 [<AbstractClass>]
 type public FsiEvaluationSessionHostConfig () = 
@@ -226,8 +225,8 @@ type public FsiEvaluationSessionHostConfig () =
 
     /// Hook for listening for evaluation bindings
     member x.OnEvaluation = evaluationEvent.Publish
-    member internal x.TriggerEvaluation (name, context, range, value) =
-        evaluationEvent.Trigger (EvaluationEventArgs (name, context, range, value) )
+    member internal x.TriggerEvaluation (name, value, symbolUse) =
+        evaluationEvent.Trigger (EvaluationEventArgs (name, value, symbolUse) )
 
 /// Used to print value signatures along with their values, according to the current
 /// set of pretty printers installed in the system, and default printing rules.
@@ -1120,23 +1119,23 @@ type internal FsiDynamicCompiler
 
         let filteredByVal =
             allNames
-            |> List.choose (function
+            |> List.choose (fun i ->
+                            match i with
                             | Nameres.Item.Value vref -> Some (vref, i)
                             | _ -> None)
 
         let actualValues =
-            filteredByVal|> List.choose (fun (vref, _) -> 
+            filteredByVal |> List.choose (fun (vref, i) -> 
                 let optValue = newState.ilxGenerator.LookupGeneratedValue(valuePrinter.GetEvaluationContext(newState.emEnv), vref.Deref)
                 match optValue with
                 | Some (res, typ) ->
-                    //let symbol = FSharpSymbol.Create(newState.tcGlobals, newState.tcState.Ccu, newState.tcImports, i)
-                    let displayEnv = newState.tcState.TcEnvFromImpls.DisplayEnv
-                    let displayContext = FSharpDisplayContext(fun _ -> displayEnv)
-                    Some(vref.DisplayName,displayContext,vref.Range,FsiValue(res, typ, FSharpType(tcGlobals, newState.tcState.Ccu, newState.tcImports, vref.Type)))
+                    let symbol = FSharpSymbol.Create(newState.tcGlobals, newState.tcState.Ccu, newState.tcImports, i)
+                    let symbolUse = FSharpSymbolUse(tcGlobals, newState.tcState.TcEnvFromImpls.DisplayEnv, symbol, ItemOccurence.Binding, vref.Range)
+                    Some(vref.DisplayName,FsiValue(res, typ, FSharpType(tcGlobals, newState.tcState.Ccu, newState.tcImports, vref.Type)), symbolUse)
                 | None -> None )
 
-        for (name, displayContext, range, fsiValue) in actualValues do 
-            fsiConfig.TriggerEvaluation (name, displayContext, range, fsiValue)
+        for (name, fsiValue, symbolUse) in actualValues do 
+            fsiConfig.TriggerEvaluation (name, fsiValue, symbolUse)
 
         newState
 

src/fsharp/fsi/fsi.fsi

@@ -30,9 +30,8 @@ type EvaluationEventArgs =
     inherit System.EventArgs
     //new : unit -> CompilerOutputStream
     member Name : string
-    member DisplayContext : Microsoft.FSharp.Compiler.SourceCodeServices.FSharpDisplayContext
-    member Range : Microsoft.FSharp.Compiler.Range.range
     member FsiValue : FsiValue
+    member SymbolUse : FSharpSymbolUse
 
 [<AbstractClass>]
 type public FsiEvaluationSessionHostConfig = 

src/fsharp/vs/service.fsi

@@ -100,6 +100,9 @@ type FSharpProjectContext =
 /// Represents the use of an F# symbol from F# source code
 [<Sealed>]
 type FSharpSymbolUse = 
+    // For internal use only
+    internal new : g:Env.TcGlobals * denv: Tastops.DisplayEnv * symbol:FSharpSymbol * itemOcc:Nameres.ItemOccurence * range: range -> FSharpSymbolUse
+
     /// The symbol referenced
     member Symbol : FSharpSymbol 
 

tests/service/FsiTests.fs

@@ -222,6 +222,32 @@ let ``Disposing interactive session (collectible)``() =
         printfn "iteration %d" i
         createSession i
 
+[<Test>]
+let ``interactive session events``() =
+
+        let defaultArgs = [|"fsi.exe";"--noninteractive";"--nologo";"--gui-"|]
+        let sbOut = StringBuilder()
+        use inStream = new StringReader("")
+        use outStream = new StringWriter(sbOut)
+        let sbErr = StringBuilder("")
+        use errStream = new StringWriter(sbErr)
+
+        let fsiConfig = FsiEvaluationSession.GetDefaultConfiguration()
+        let evals = ResizeArray()
+        use evaluator = fsiConfig.OnEvaluation.Subscribe (fun eval -> evals.Add (eval.FsiValue, eval.Name, eval.SymbolUse))
+
+        use session = FsiEvaluationSession.Create(fsiConfig, defaultArgs, inStream, outStream, errStream, collectible=true)
+        session.EvalInteraction  "let x = 42"
+        
+        let value, name, symbol = evals.[0]
+        // name should be x 
+        // value should be 42
+        // symbol type should be a FSharpMemberOrFunctionOrValue and display name "x"
+        name |> should equal "x"
+        value.ReflectionValue |> should equal 42
+        symbol.Symbol.GetType() |> should equal typeof<FSharpMemberOrFunctionOrValue>
+        symbol.Symbol.DisplayName |> should equal "x"
+
 
 let RunManually() = 
   ``EvalExpression test 1``() 
@@ -240,6 +266,7 @@ let RunManually() =
   ``Bad arguments to session creation 1``()
   ``Bad arguments to session creation 2``()
   ``EvalScript accepts paths verbatim``()
+  ``interactive session events``()
   ``Disposing interactive session (collectible)``() 
 
 //#endif