Integrate with CPSProject workspace

Author: Omar Tawfik

vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj

@@ -32,7 +32,6 @@
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="CommonConstants.fs" />
     <Compile Include="CommonRoslynHelpers.fs" />
-    <Compile Include="ProjectSite.fs" />
     <Compile Include="LanguageService.fs" />
     <Compile Include="ColorizationService.fs">
       <Link>Classification\ColorizationService.fs</Link>

vsintegration/src/FSharp.Editor/LanguageService.fs

@@ -5,6 +5,8 @@ namespace Microsoft.VisualStudio.FSharp.Editor
 open System
 open System.Collections.Generic
 open System.Runtime.InteropServices
+open System.Linq
+open System.IO
 
 open Microsoft.FSharp.Compiler.SourceCodeServices
 
@@ -15,7 +17,9 @@ open Microsoft.VisualStudio.LanguageServices
 open Microsoft.VisualStudio.LanguageServices.Implementation.LanguageService
 open Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem
 open Microsoft.VisualStudio.LanguageServices.Implementation.DebuggerIntelliSense
+open Microsoft.VisualStudio.LanguageServices.Implementation.TaskList
 open Microsoft.VisualStudio.LanguageServices.Implementation
+open Microsoft.VisualStudio.LanguageServices.ProjectSystem
 open Microsoft.VisualStudio.Shell
 open Microsoft.VisualStudio.Shell.Interop
 open Microsoft.VisualStudio.FSharp.LanguageService
@@ -27,7 +31,7 @@ type internal SVsSettingsPersistenceManager = class end
 
 [<Guid(FSharpCommonConstants.languageServiceGuidString)>]
 type internal FSharpLanguageService(package : FSharpPackage) = 
-    inherit AbstractLanguageService<FSharpPackage, FSharpLanguageService, FSharpProjectSite>(package)
+    inherit AbstractLanguageService<FSharpPackage, FSharpLanguageService>(package)
 
     static let optionsCache = Dictionary<ProjectId, FSharpProjectOptions>()
     static member GetOptions(projectId: ProjectId) =
@@ -36,23 +40,25 @@ type internal FSharpLanguageService(package : FSharpPackage) =
         else
             None
 
+    member this.SyncProject(projectContext: IWorkspaceProjectContext, site: IProjectSite) =
+        let updatedFiles = site.SourceFilesOnDisk()
+        let workspaceFiles = (projectContext :?> AbstractProject).GetCurrentDocuments() |> Seq.map(fun file -> file.FilePath)
+        
+        for file in updatedFiles do if not(workspaceFiles.Contains(file)) then projectContext.AddSourceFile(file)
+        for file in workspaceFiles do if not(updatedFiles.Contains(file)) then projectContext.RemoveSourceFile(file)
+
     override this.ContentTypeName = FSharpCommonConstants.FSharpContentTypeName
     override this.LanguageName = FSharpCommonConstants.FSharpLanguageName
     override this.RoslynLanguageName = FSharpCommonConstants.FSharpLanguageName
 
     override this.LanguageServiceId = new Guid(FSharpCommonConstants.languageServiceGuidString)
-    override this.DebuggerLanguageId = DebuggerEnvironment.GetLanguageID()
-
-    override this.CreateContext(_,_,_,_,_) = raise(System.NotImplementedException())
 
     override this.SetupNewTextView(view) =
-        base.SetupNewTextView(view)
         let workspace = this.Package.ComponentModel.GetService<VisualStudioWorkspaceImpl>();
-
+                    
         // FSROSLYNTODO: Hide navigation bars for now. Enable after adding tests
         workspace.Options <- workspace.Options.WithChangedOption(NavigationBarOptions.ShowNavigationBar, FSharpCommonConstants.FSharpLanguageName, false)
 
-        // Ensure that we have a project in the workspace for this document.
         let (_, buffer) = view.GetBuffer()
         let filename = VsTextLines.GetFilename buffer
         let result = VsRunningDocumentTable.FindDocumentWithoutLocking(package.RunningDocumentTable,filename)
@@ -61,6 +67,7 @@ type internal FSharpLanguageService(package : FSharpPackage) =
             match hier with
             | :? IProvideProjectSite as siteProvider ->
                 let site = siteProvider.GetProjectSite()
+                let projectGuid = Guid(site.ProjectGuid)
                 let projectFileName = site.ProjectFileName()
                 let projectId = workspace.ProjectTracker.GetOrCreateProjectIdForPath(projectFileName, projectFileName)
 
@@ -69,14 +76,20 @@ type internal FSharpLanguageService(package : FSharpPackage) =
                     optionsCache.Add(projectId, options)
 
                 if obj.ReferenceEquals(workspace.ProjectTracker.GetProject(projectId), null) then
-                    let projectSite = new FSharpProjectSite(hier, this.SystemServiceProvider, workspace, projectFileName, projectId.Id);
-                    projectSite.Initialize(hier, site)                    
+                    let projectContextFactory = this.Package.ComponentModel.GetService<IWorkspaceProjectContextFactory>();
+                    let errorReporter = ProjectExternalErrorReporter(projectId, "FS", this.SystemServiceProvider)
+                    let outputFlag = (site.CompilerFlags() |> Seq.find(fun flag -> flag.StartsWith("-o:"))).Substring(3)
+                    let outputPath = if Path.IsPathRooted(outputFlag) then outputFlag else Path.Combine(Path.GetDirectoryName(projectFileName), outputFlag)
+
+                    let projectContext = projectContextFactory.CreateProjectContext(FSharpCommonConstants.FSharpLanguageName, projectFileName, projectFileName, projectGuid, hier, outputPath, errorReporter)
+                    this.SyncProject(projectContext, site)
+                    site.AdviseProjectSiteChanges(FSharpCommonConstants.FSharpLanguageServiceCallbackName, AdviseProjectSiteChanges(fun () -> this.SyncProject(projectContext, site)))
             | _ -> ()
         | _ -> ()
 
 and [<Guid(FSharpCommonConstants.packageGuidString)>]
     internal FSharpPackage() = 
-    inherit AbstractPackage<FSharpPackage, FSharpLanguageService, FSharpProjectSite>()
+    inherit AbstractPackage<FSharpPackage, FSharpLanguageService>()
 
     override this.RoslynLanguageName = FSharpCommonConstants.FSharpLanguageName
 

vsintegration/src/FSharp.Editor/ProjectSite.fs

@@ -43,6 +43,9 @@ type internal IProjectSite =
     /// target framework moniker
     abstract TargetFrameworkMoniker : string
 
+    /// Project Guid
+    abstract ProjectGuid : string
+
     /// timestamp the site was last loaded
     abstract LoadTime : System.DateTime 
 

vsintegration/src/FSharp.LanguageService/IProjectSite.fs

@@ -35,6 +35,7 @@ type private ProjectSiteOfScriptFile(filename:string, checkOptions : FSharpProje
         override this.AdviseProjectSiteClosed(_,_) = ()
         override this.IsIncompleteTypeCheckEnvironment = checkOptions.IsIncompleteTypeCheckEnvironment
         override this.TargetFrameworkMoniker = ""
+        override this.ProjectGuid = ""
         override this.LoadTime = checkOptions.LoadTime
 
     interface IHaveCheckOptions with
@@ -66,6 +67,7 @@ type private ProjectSiteOfSingleFile(sourceFile) =
         override this.AdviseProjectSiteClosed(_,_) = ()
         override this.IsIncompleteTypeCheckEnvironment = true
         override this.TargetFrameworkMoniker = ""
+        override this.ProjectGuid = ""
         override this.LoadTime = new DateTime(2000,1,1)  // any constant time is fine, orphan files do not interact with reloading based on update time
 
 /// Information about projects, open files and other active artifacts in visual studio.

vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs

@@ -3031,6 +3031,13 @@ internal string GetTargetFrameworkMoniker()
             return moniker;
         }
 
+        internal string GetProjectGuid()
+        {
+            string guid = projectMgr.GetProjectProperty(ProjectFileConstants.ProjectGuid) as String;
+            Debug.Assert(!String.IsNullOrEmpty(guid), "No project guid?");
+            return guid;
+        }
+
         internal uint GetTargetFrameworkVersion()
         {
             var version = new System.Runtime.Versioning.FrameworkName(GetTargetFrameworkMoniker()).Version;

vsintegration/src/FSharp.ProjectSystem.Base/Project/HierarchyNode.cs

@@ -96,6 +96,7 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
             member ips.ErrorListTaskProvider() = inner.ErrorListTaskProvider()
             member ips.ErrorListTaskReporter() = inner.ErrorListTaskReporter()
             member ips.TargetFrameworkMoniker = inner.TargetFrameworkMoniker
+            member ips.ProjectGuid = inner.ProjectGuid
             member ips.IsIncompleteTypeCheckEnvironment = false
             member ips.LoadTime = inner.LoadTime 
 
@@ -1476,6 +1477,7 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
                         closeNotifier.Advise(callbackOwnerKey,callback)
                     member this.IsIncompleteTypeCheckEnvironment = false
                     member this.TargetFrameworkMoniker = x.GetTargetFrameworkMoniker()
+                    member this.ProjectGuid = x.GetProjectGuid()
                     member this.LoadTime = creationTime
                 }
 
@@ -1506,6 +1508,7 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
                     member this.AdviseProjectSiteClosed(_,_) = ()
                     member this.IsIncompleteTypeCheckEnvironment = false
                     member this.TargetFrameworkMoniker = targetFrameworkMoniker
+                    member this.ProjectGuid = x.GetProjectGuid()
                     member this.LoadTime = creationTime
                 }