add time stamp cache

Author: dsyme

src/absil/illib.fs

@@ -968,7 +968,6 @@ module Shim =
         abstract AssemblyLoadFrom: fileName:string -> System.Reflection.Assembly 
         abstract AssemblyLoad: assemblyName:System.Reflection.AssemblyName -> System.Reflection.Assembly 
 
-
     type DefaultFileSystem() =
         interface IFileSystem with
             member __.AssemblyLoadFrom(fileName:string) = 

src/fsharp/CompileOps.fs

@@ -1749,13 +1749,21 @@ type IRawFSharpAssemblyData =
     abstract HasAnyFSharpSignatureDataAttribute : ILGlobals -> bool
     abstract HasMatchingFSharpSignatureDataAttribute : ILGlobals -> bool
 
-type IProjectReference = 
+type TimeStampCache() = 
+    let now = DateTime.Now
+    let files = Dictionary<string,DateTime>()
+    let projects = Dictionary<IProjectReference,DateTime>(HashIdentity.Reference)
+    member x.Now = now
+    member x.Files = files
+    member x.Projects = projects
+
+and IProjectReference = 
     /// The name of the assembly file generated by the project
     abstract FileName : string 
     /// Evaluate raw contents of the assembly file generated by the project
     abstract EvaluateRawContents : unit -> IRawFSharpAssemblyData option
     /// Get the logical timestamp that would be the timestamp of the assembly file generated by the project
-    abstract GetLogicalTimeStamp : unit -> System.DateTime option
+    abstract GetLogicalTimeStamp : TimeStampCache -> DateTime option
 
 type AssemblyReference = 
     | AssemblyReference of range * string * IProjectReference option

src/fsharp/CompileOps.fsi

@@ -3,7 +3,9 @@
 /// Coordinating compiler operations - configuration, loading initial context, reporting errors etc.
 module internal Microsoft.FSharp.Compiler.CompileOps
 
+open System
 open System.Text
+open System.Collections.Generic
 open Internal.Utilities
 open Microsoft.FSharp.Compiler.AbstractIL 
 open Microsoft.FSharp.Compiler.AbstractIL.IL
@@ -164,13 +166,20 @@ type IRawFSharpAssemblyData =
     abstract ILAssemblyRefs : ILAssemblyRef list
     abstract ShortAssemblyName : string
 
-type IProjectReference = 
+
+type TimeStampCache = 
+    new : unit -> TimeStampCache
+    member Now: DateTime
+    member Files: Dictionary<string,DateTime> 
+    member Projects:Dictionary<IProjectReference,DateTime>
+
+and IProjectReference = 
     /// The name of the assembly file generated by the project
     abstract FileName : string 
     /// Evaluate raw contents of the assembly file generated by the project
     abstract EvaluateRawContents : unit -> IRawFSharpAssemblyData option
     /// Get the logical timestamp that would be the timestamp of the assembly file generated by the project
-    abstract GetLogicalTimeStamp : unit -> System.DateTime option
+    abstract GetLogicalTimeStamp : TimeStampCache -> DateTime option
 
 type AssemblyReference = 
     | AssemblyReference of range * string  * IProjectReference option

src/fsharp/vs/IncrementalBuild.fs

@@ -118,7 +118,7 @@ type internal IncrementalBuilder =
       member ThereAreLiveTypeProviders : bool
 #endif
       /// Perform one step in the F# build. Return true if the background work is finished.
-      member Step : unit -> bool
+      member Step : TimeStampCache -> bool
 
       /// Get the preceding typecheck state of a slot, without checking if it is up-to-date w.r.t.
       /// the timestamps on files and referenced DLLs prior to this one. Return None if the result is not available.
@@ -155,7 +155,7 @@ type internal IncrementalBuilder =
       member GetCheckResultsAndImplementationsForProject : unit -> PartialCheckResults * IL.ILAssemblyRef * IRawFSharpAssemblyData option * Tast.TypedAssembly option
 
       /// Get the logical time stamp that is associated with the output of the project if it were gully built immediately
-      member GetLogicalTimeStampForProject: unit -> DateTime
+      member GetLogicalTimeStampForProject: cache: TimeStampCache -> DateTime
 
       /// Await the untyped parse results for a particular slot in the vector of parse results.
       ///

src/fsharp/vs/IncrementalBuild.fsi

@@ -31,7 +31,7 @@ type FSharpParseFileResults =
     /// Return the inner-most range associated with a possible breakpoint location
     member ValidateBreakpointLocation : pos:pos -> range option
 
-    /// When these files change then the build is invalid
+    [<System.Obsolete("This property is now on FSharpCheckFileResults and FSharpCheckProjectResults. It indicates the set of file dependencies for checking a file or project.")>]
     member DependencyFiles : string list
 
     /// Get the errors and warnings for the parse

src/fsharp/vs/ServiceUntypedParse.fsi

@@ -1878,7 +1878,7 @@ type FSharpProjectContext(thisCcu: CcuThunk, assemblies: FSharpAssembly list, ad
 
 [<Sealed>]
 // 'details' is an option because the creation of the tcGlobals etc. for the project may have failed.
-type FSharpCheckProjectResults(keepAssemblyContents, errors: FSharpErrorInfo[], details:(TcGlobals*TcImports*CcuThunk*ModuleOrNamespaceType*TcSymbolUses list*TopAttribs option*CompileOps.IRawFSharpAssemblyData option * ILAssemblyRef * AccessorDomain * TypedAssembly option) option, reactorOps: IReactorOperations) =
+type FSharpCheckProjectResults(keepAssemblyContents, errors: FSharpErrorInfo[], details:(TcGlobals*TcImports*CcuThunk*ModuleOrNamespaceType*TcSymbolUses list*TopAttribs option*CompileOps.IRawFSharpAssemblyData option * ILAssemblyRef * AccessorDomain * TypedAssembly option * string list) option, reactorOps: IReactorOperations) =
 
     let getDetails() = 
         match details with 
@@ -1890,12 +1890,12 @@ type FSharpCheckProjectResults(keepAssemblyContents, errors: FSharpErrorInfo[],
     member info.HasCriticalErrors = details.IsNone
 
     member info.AssemblySignature =  
-        let (tcGlobals, tcImports, thisCcu, ccuSig, _tcSymbolUses, topAttribs, _tcAssemblyData, _ilAssemRef, _ad, _tcAssemblyExpr) = getDetails()
+        let (tcGlobals, tcImports, thisCcu, ccuSig, _tcSymbolUses, topAttribs, _tcAssemblyData, _ilAssemRef, _ad, _tcAssemblyExpr, _dependencyFiles) = getDetails()
         FSharpAssemblySignature(tcGlobals, thisCcu, tcImports, topAttribs, ccuSig)
 
     member info.AssemblyContents =  
         if not keepAssemblyContents then invalidOp "The 'keepAssemblyContents' flag must be set to tru on the FSharpChecker in order to access the checked contents of assemblies"
-        let (tcGlobals, tcImports, thisCcu, _ccuSig, _tcSymbolUses, _topAttribs, _tcAssemblyData, _ilAssemRef, _ad, tcAssemblyExpr) = getDetails()
+        let (tcGlobals, tcImports, thisCcu, _ccuSig, _tcSymbolUses, _topAttribs, _tcAssemblyData, _ilAssemRef, _ad, tcAssemblyExpr, _dependencyFiles) = getDetails()
         let mimpls = 
             match tcAssemblyExpr with 
             | None -> []
@@ -1904,7 +1904,7 @@ type FSharpCheckProjectResults(keepAssemblyContents, errors: FSharpErrorInfo[],
 
     // Not, this does not have to be a SyncOp, it can be called from any thread
     member info.GetUsesOfSymbol(symbol:FSharpSymbol) = 
-        let (tcGlobals, _tcImports, _thisCcu, _ccuSig, tcSymbolUses, _topAttribs, _tcAssemblyData, _ilAssemRef, _ad, _tcAssemblyExpr) = getDetails()
+        let (tcGlobals, _tcImports, _thisCcu, _ccuSig, tcSymbolUses, _topAttribs, _tcAssemblyData, _ilAssemRef, _ad, _tcAssemblyExpr, _dependencyFiles) = getDetails()
         // This probably doesn't need to be run on the reactor since all data touched by GetUsesOfSymbol is immutable.
         reactorOps.EnqueueAndAwaitOpAsync("GetUsesOfSymbol", fun _ct -> 
             [| for r in tcSymbolUses do yield! r.GetUsesOfSymbol(symbol.Item) |] 
@@ -1914,7 +1914,7 @@ type FSharpCheckProjectResults(keepAssemblyContents, errors: FSharpErrorInfo[],
 
     // Not, this does not have to be a SyncOp, it can be called from any thread
     member info.GetAllUsesOfAllSymbols() = 
-        let (tcGlobals, tcImports, thisCcu, _ccuSig, tcSymbolUses, _topAttribs, _tcAssemblyData, _ilAssemRef, _ad, _tcAssemblyExpr) = getDetails()
+        let (tcGlobals, tcImports, thisCcu, _ccuSig, tcSymbolUses, _topAttribs, _tcAssemblyData, _ilAssemRef, _ad, _tcAssemblyExpr, _dependencyFiles) = getDetails()
         // This probably doesn't need to be run on the reactor since all data touched by GetAllUsesOfSymbols is immutable.
         reactorOps.EnqueueAndAwaitOpAsync("GetAllUsesOfAllSymbols", fun _ct -> 
             [| for r in tcSymbolUses do 
@@ -1923,18 +1923,22 @@ type FSharpCheckProjectResults(keepAssemblyContents, errors: FSharpErrorInfo[],
                     yield FSharpSymbolUse(tcGlobals, denv, symbol, itemOcc, m) |]) 
 
     member info.ProjectContext = 
-        let (tcGlobals, tcImports, thisCcu, _ccuSig, _tcSymbolUses, _topAttribs, _tcAssemblyData, _ilAssemRef, ad, _tcAssemblyExpr) = getDetails()
+        let (tcGlobals, tcImports, thisCcu, _ccuSig, _tcSymbolUses, _topAttribs, _tcAssemblyData, _ilAssemRef, ad, _tcAssemblyExpr, _dependencyFiles) = getDetails()
         let assemblies = 
             [ for x in tcImports.GetImportedAssemblies() do
                 yield FSharpAssembly(tcGlobals, tcImports, x.FSharpViewOfMetadata) ]
         FSharpProjectContext(thisCcu, assemblies, ad) 
 
     member info.RawFSharpAssemblyData = 
-        let (_tcGlobals, _tcImports, _thisCcu, _ccuSig, _tcSymbolUses, _topAttribs, tcAssemblyData, _ilAssemRef, _ad, _tcAssemblyExpr) = getDetails()
+        let (_tcGlobals, _tcImports, _thisCcu, _ccuSig, _tcSymbolUses, _topAttribs, tcAssemblyData, _ilAssemRef, _ad, _tcAssemblyExpr, _dependencyFiles) = getDetails()
         tcAssemblyData
 
+    member info.DependencyFiles = 
+        let (_tcGlobals, _tcImports, _thisCcu, _ccuSig, _tcSymbolUses, _topAttribs, _tcAssemblyData, _ilAssemRef, _ad, _tcAssemblyExpr, dependencyFiles) = getDetails()
+        dependencyFiles
+
     member info.AssemblyFullName = 
-        let (_tcGlobals, _tcImports, _thisCcu, _ccuSig, _tcSymbolUses, _topAttribs, _tcAssemblyData, ilAssemRef, _ad, _tcAssemblyExpr) = getDetails()
+        let (_tcGlobals, _tcImports, _thisCcu, _ccuSig, _tcSymbolUses, _topAttribs, _tcAssemblyData, ilAssemRef, _ad, _tcAssemblyExpr, _dependencyFiles) = getDetails()
         ilAssemRef.QualifiedName
 
 [<Sealed>]
@@ -2084,6 +2088,12 @@ type FSharpCheckFileResults(errors: FSharpErrorInfo[], scopeOptX: TypeCheckInfo
                // This operation is not asynchronous - GetReferencedAssemblies can be run on the calling thread
                 FSharpProjectContext(scope.ThisCcu, scope.GetReferencedAssemblies(), scope.AccessRights))
 
+    member info.DependencyFiles = 
+        threadSafeOp 
+            (fun () -> []) 
+            (fun (_scope, builder, _reactor) -> match builder with None -> [] | Some b -> b.Dependencies)
+
+
     member info.GetAllUsesOfAllSymbolsInFile() = 
         reactorOp "GetAllUsesOfAllSymbolsInFile" [| |] (fun scope -> 
             [| for (item,itemOcc,denv,m) in scope.ScopeSymbolUses.GetAllUsesOfSymbols() do
@@ -2226,8 +2236,8 @@ type BackgroundCompiler(projectCacheSize, keepAssemblyContents, keepAllBackgroun
                         member x.EvaluateRawContents() = 
                             let r = self.ParseAndCheckProjectImpl(opts)
                             r.RawFSharpAssemblyData 
-                        member x.GetLogicalTimeStamp() = 
-                            self.GetLogicalTimeStampForProject(opts)
+                        member x.GetLogicalTimeStamp cache = 
+                            self.GetLogicalTimeStampForProject(cache,opts)
                         member x.FileName = nm } ]
 
         let builderOpt, errorsAndWarnings = 
@@ -2541,14 +2551,14 @@ type BackgroundCompiler(projectCacheSize, keepAssemblyContents, keepAllBackgroun
         | Some builder -> 
             let (tcProj, ilAssemRef, tcAssemblyDataOpt, tcAssemblyExprOpt)  = builder.GetCheckResultsAndImplementationsForProject()
             let errors = [| yield! creationErrors; yield! Parser.CreateErrorInfos (tcProj.TcConfig, true, Microsoft.FSharp.Compiler.TcGlobals.DummyFileNameForRangesWithoutASpecificLocation, tcProj.Errors) |]
-            FSharpCheckProjectResults (keepAssemblyContents, errors, Some(tcProj.TcGlobals, tcProj.TcImports, tcProj.TcState.Ccu, tcProj.TcState.PartialAssemblySignature, tcProj.TcSymbolUses, tcProj.TopAttribs, tcAssemblyDataOpt, ilAssemRef, tcProj.TcEnvAtEnd.AccessRights, tcAssemblyExprOpt), reactorOps)
+            FSharpCheckProjectResults (keepAssemblyContents, errors, Some(tcProj.TcGlobals, tcProj.TcImports, tcProj.TcState.Ccu, tcProj.TcState.PartialAssemblySignature, tcProj.TcSymbolUses, tcProj.TopAttribs, tcAssemblyDataOpt, ilAssemRef, tcProj.TcEnvAtEnd.AccessRights, tcAssemblyExprOpt, builder.Dependencies), reactorOps)
 
     /// Get the timestamp that would be on the output if fully built immediately
-    member private bc.GetLogicalTimeStampForProject(options) =
+    member private bc.GetLogicalTimeStampForProject(cache, options) =
         let builderOpt,_creationErrors,_ = getOrCreateBuilder options
         match builderOpt with 
         | None -> None
-        | Some builder -> Some (builder.GetLogicalTimeStampForProject())
+        | Some builder -> Some (builder.GetLogicalTimeStampForProject cache)
 
     /// Parse and typecheck the whole project.
     member bc.ParseAndCheckProject(options) =
@@ -2612,11 +2622,12 @@ type BackgroundCompiler(projectCacheSize, keepAssemblyContents, keepAllBackgroun
 #endif
 
     member bc.CheckProjectInBackground(options) =
+        let cache = TimeStampCache() // Only one TimeStampCache is used for the duration of each background project check
         reactor.SetBackgroundOp(Some(fun () -> 
             let builderOpt,_,_ = getOrCreateBuilder options
             match builderOpt with 
             | None -> false
-            | Some builder -> builder.Step()))
+            | Some builder -> builder.Step(cache)))
 
     member bc.StopBackgroundCompile() =
         reactor.SetBackgroundOp(None)
@@ -2758,6 +2769,11 @@ type FSharpChecker(projectCacheSize, keepAssemblyContents, keepAllBackgroundReso
     member ic.InvalidateConfiguration(options: FSharpProjectOptions) =
         backgroundCompiler.InvalidateConfiguration options
 
+    /// This function is called when the configuration is known to have changed for reasons not encoded in the ProjectOptions.
+    /// For example, dependent references may have been deleted or created.
+    member ic.NotifyDependencyChanged(options: FSharpProjectOptions) =
+        backgroundCompiler.InvalidateConfiguration options
+
     /// This function is called when a project has been cleaned, and thus type providers should be refreshed.
     member ic.NotifyProjectCleaned(options: FSharpProjectOptions) =
         backgroundCompiler.NotifyProjectCleaned options
@@ -2896,7 +2912,7 @@ type FsiInteractiveChecker(reactorOps: IReactorOperations, tcConfig, tcGlobals,
         | Parser.TypeCheckAborted.No scope ->
             let errors = [|  yield! parseErrors; yield! tcErrors |]
             let typeCheckResults = FSharpCheckFileResults (errors,Some scope, None, reactorOps)   
-            let projectResults = FSharpCheckProjectResults (keepAssemblyContents, errors, Some(tcGlobals, tcImports, scope.ThisCcu, scope.CcuSig, [scope.ScopeSymbolUses], None, None, mkSimpleAssRef "stdin", tcState.TcEnvFromImpls.AccessRights, None), reactorOps)
+            let projectResults = FSharpCheckProjectResults (keepAssemblyContents, errors, Some(tcGlobals, tcImports, scope.ThisCcu, scope.CcuSig, [scope.ScopeSymbolUses], None, None, mkSimpleAssRef "stdin", tcState.TcEnvFromImpls.AccessRights, None, dependencyFiles), reactorOps)
             parseResults, typeCheckResults, projectResults
         | _ -> 
             failwith "unexpected aborted"

src/fsharp/vs/service.fs

@@ -100,6 +100,7 @@ type FSharpProjectContext =
     /// Get the accessibility rights for this project context w.r.t. InternalsVisibleTo attributes granting access to other assemblies
     member AccessibilityRights : FSharpAccessibilityRights
 
+
 /// Represents the use of an F# symbol from F# source code
 [<Sealed>]
 type FSharpSymbolUse = 
@@ -157,6 +158,11 @@ type FSharpCheckFileResults =
     /// an unrecoverable error in earlier checking/parsing/resolution steps.
     member HasFullTypeCheckInfo: bool
 
+    /// Indicates the set of files which must be watched to accurately track changes that affect these results,
+    /// Clients interested in reacting to updates to these files should watch these files and take actions as described
+    /// in the documentation for compiler service.
+    member DependencyFiles : string list
+
     /// <summary>Get the items for a declaration list</summary>
     ///
     /// <param name="ParsedFileResultsOpt">
@@ -272,7 +278,6 @@ type FSharpCheckFileResults =
     /// Get the textual usages that resolved to the given symbol throughout the file
     member GetUsesOfSymbolInFile : symbol:FSharpSymbol -> Async<FSharpSymbolUse[]>
 
-
     [<System.Obsolete("Please change to use GetSymbolUseAtLocation(...).Symbol")>]
     member GetSymbolAtLocationAlternate  : line:int * colAtEndOfNames:int * lineText:string * names:string list -> Async<FSharpSymbol option>
 
@@ -332,6 +337,10 @@ type FSharpCheckProjectResults =
     /// Indicates if critical errors existed in the project options
     member HasCriticalErrors : bool 
 
+    /// Indicates the set of files which must be watched to accurately track changes that affect these results,
+    /// Clients interested in reacting to updates to these files should watch these files and take actions as described
+    /// in the documentation for compiler service.
+    member DependencyFiles : string list
 
 /// <summary>Unused in this API</summary>
 type UnresolvedReferencesSet