WIP: Map workspace to iprojectsite #3391
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,11 +7,13 @@ namespace Microsoft.VisualStudio.FSharp.Editor | |
| open System | ||
| open System.Collections.Concurrent | ||
| open System.Collections.Generic | ||
| open System.Collections.Immutable | ||
| open System.ComponentModel.Composition | ||
| open System.Diagnostics | ||
| open System.IO | ||
| open System.Linq | ||
| open System.Runtime.CompilerServices | ||
| open System.Runtime.InteropServices | ||
|
|
||
| open Microsoft.FSharp.Compiler.CompileOps | ||
| open Microsoft.FSharp.Compiler.SourceCodeServices | ||
|
|
@@ -23,6 +25,7 @@ open Microsoft.CodeAnalysis.Options | |
| open Microsoft.VisualStudio | ||
| open Microsoft.VisualStudio.Editor | ||
| open Microsoft.VisualStudio.TextManager.Interop | ||
| open Microsoft.VisualStudio.LanguageServices | ||
| open Microsoft.VisualStudio.LanguageServices.Implementation.LanguageService | ||
| open Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem | ||
| open Microsoft.VisualStudio.LanguageServices.Implementation.TaskList | ||
|
|
@@ -265,14 +268,12 @@ type | |
|
|
||
| override this.CreateWorkspace() = this.ComponentModel.GetService<VisualStudioWorkspaceImpl>() | ||
|
|
||
| override this.CreateLanguageService() = FSharpLanguageService(this) | ||
|
|
||
| override this.CreateEditorFactories() = Seq.empty<IVsEditorFactory> | ||
|
|
||
| override this.RegisterMiscellaneousFilesWorkspaceInformation(_) = () | ||
| and | ||
| [<Guid(FSharpConstants.languageServiceGuidString)>] | ||
| [<ProvideLanguageExtension(typeof<FSharpLanguageService>, ".fs")>] | ||
| [<ProvideLanguageExtension(typeof<FSharpLanguageService>, ".fsi")>] | ||
|
|
@@ -316,12 +317,27 @@ and | |
| override this.Initialize() = | ||
| base.Initialize() | ||
|
|
||
| let workspaceChanged (args:WorkspaceChangeEventArgs) = | ||
| match args.Kind with | ||
| | WorkspaceChangeKind.ProjectAdded | ||
| | WorkspaceChangeKind.ProjectChanged | ||
| | WorkspaceChangeKind.ProjectRemoved | ||
| | WorkspaceChangeKind.DocumentAdded | ||
| | WorkspaceChangeKind.DocumentRemoved | ||
| | WorkspaceChangeKind.AdditionalDocumentAdded | ||
| | WorkspaceChangeKind.AdditionalDocumentRemoved | ||
| | WorkspaceChangeKind.SolutionCleared -> | ||
| for projectId in this.Workspace.CurrentSolution.ProjectIds do | ||
| let project = this.Workspace.CurrentSolution.GetProject(projectId) | ||
| let siteProvider = this.ProvideProjectSiteProvider(this.Workspace, project) | ||
| this.SetupProjectFile(siteProvider, this.Workspace, "setupProjectsAfterSolutionOpen") | ||
| | _ -> () | ||
|
|
||
| this.Workspace.Options <- this.Workspace.Options.WithChangedOption(Completion.CompletionOptions.BlockForCompletionItems, FSharpConstants.FSharpLanguageName, false) | ||
| this.Workspace.Options <- this.Workspace.Options.WithChangedOption(Shared.Options.ServiceFeatureOnOffOptions.ClosedFileDiagnostic, FSharpConstants.FSharpLanguageName, Nullable false) | ||
| this.Workspace.DocumentClosed.Add <| fun args -> tryRemoveSingleFileProject args.Document.Project.Id | ||
| this.Workspace.WorkspaceChanged.Add(workspaceChanged) | ||
|
|
||
| Events.SolutionEvents.OnAfterCloseSolution.Add <| fun _ -> | ||
| //checkerProvider.Checker.StopBackgroundCompile() | ||
|
|
||
|
|
@@ -334,7 +350,7 @@ and | |
| singleFileProjects.Keys |> Seq.iter tryRemoveSingleFileProject | ||
|
|
||
| let ctx = System.Threading.SynchronizationContext.Current | ||
|
|
||
| let rec setupProjectsAfterSolutionOpen() = | ||
| async { | ||
| use openedProjects = MailboxProcessor.Start <| fun inbox -> | ||
|
|
@@ -358,9 +374,9 @@ and | |
|
|
||
| let theme = package.ComponentModel.DefaultExportProvider.GetExport<ISetThemeColors>().Value | ||
| theme.SetColors() | ||
|
|
||
| /// Sync the information for the project | ||
| member __.SyncProject(project: AbstractProject, projectContext: IWorkspaceProjectContext, site: IProjectSite, workspace, forceUpdate, userOpName) = | ||
| let wellFormedFilePathSetIgnoreCase (paths: seq<string>) = | ||
| HashSet(paths |> Seq.filter isPathWellFormed |> Seq.map (fun s -> try System.IO.Path.GetFullPath(s) with _ -> s), StringComparer.OrdinalIgnoreCase) | ||
|
|
||
|
|
@@ -378,7 +394,7 @@ and | |
| if not(updatedFiles.Contains(file)) then | ||
| projectContext.RemoveSourceFile(file) | ||
| updated <- true | ||
|
|
||
| let updatedRefs = site.AssemblyReferences() |> wellFormedFilePathSetIgnoreCase | ||
| let originalRefs = project.GetCurrentMetadataReferences() |> Seq.map (fun ref -> ref.FilePath) |> wellFormedFilePathSetIgnoreCase | ||
|
|
||
|
|
@@ -417,42 +433,49 @@ and | |
|
|
||
| member this.SetupProjectFile(siteProvider: IProvideProjectSite, workspace: VisualStudioWorkspaceImpl, userOpName) = | ||
| let userOpName = userOpName + ".SetupProjectFile" | ||
| let rec setup (site: IProjectSite) = | ||
| let projectGuid = Guid(site.ProjectGuid) | ||
| let projectFileName = site.ProjectFileName() | ||
| let projectDisplayName = projectDisplayNameOf projectFileName | ||
| let projectId = workspace.ProjectTracker.GetOrCreateProjectIdForPath(projectFileName, projectDisplayName) | ||
|
|
||
| projectInfoManager.UpdateProjectInfo(tryGetOrCreateProjectId workspace, projectId, site, workspace, userOpName) | ||
| let projectContextFactory = package.ComponentModel.GetService<IWorkspaceProjectContextFactory>(); | ||
| let errorReporter = ProjectExternalErrorReporter(projectId, "FS", this.SystemServiceProvider) | ||
|
|
||
| // Roslyn is expecting site to be an IVsHierarchy. | ||
| // It just so happens that the object that implements IProvideProjectSite is also | ||
| // an IVsHierarchy. This assertion is to ensure that the assumption holds true. | ||
| let hierarchy = | ||
| site.ProjectProvider | ||
| |> Option.map (fun p -> p :?> IVsHierarchy) | ||
| |> Option.toObj | ||
| Debug.Assert(hierarchy <> null, "About to CreateProjectContext with a non-hierarchy site") | ||
|
|
||
| let isnew, project = | ||
| let p = workspace.ProjectTracker.GetProject projectId | ||
| match p with | ||
| | null -> | ||
| true, projectContextFactory.CreateProjectContext( | ||
|
Member
There was a problem hiding this comment. Some comments about the fact that the language service is the one responsible for putting legacy projects into the workspace, but the project system does it for CPS based projects might make this clearer. At first glance it was strange that this existed in a method that is hooked up to |
||
| FSharpConstants.FSharpLanguageName, | ||
| projectDisplayName, | ||
| projectFileName, | ||
| projectGuid, | ||
| hierarchy, | ||
| null, | ||
| errorReporter) :?> AbstractProject | ||
| | _ -> false, p | ||
|
|
||
| match project :> obj with | ||
| | :? IWorkspaceProjectContext as projectContext -> | ||
| this.SyncProject(project, projectContext, site, workspace, forceUpdate=false, userOpName=userOpName) | ||
| site.AdviseProjectSiteChanges(FSharpConstants.FSharpLanguageServiceCallbackName, | ||
| AdviseProjectSiteChanges(fun () -> this.SyncProject(project, projectContext, site, workspace, forceUpdate=true, userOpName="AdviseProjectSiteChanges."+userOpName))) | ||
| site.AdviseProjectSiteClosed(FSharpConstants.FSharpLanguageServiceCallbackName, | ||
| AdviseProjectSiteChanges(fun () -> | ||
| projectInfoManager.ClearInfoForProject(project.Id) | ||
| optionsAssociation.Remove(projectContext) |> ignore | ||
| project.Disconnect())) | ||
| let referencedProjectSites = ProjectSitesAndFiles.GetReferencedProjectSites (site, this.SystemServiceProvider) | ||
|
|
||
| for referencedSite in referencedProjectSites do | ||
|
|
@@ -469,6 +492,68 @@ and | |
|
|
||
| setup (siteProvider.GetProjectSite()) |> ignore | ||
|
|
||
| member private __.ProvideProjectSiteProvider(workspace:Workspace, project:Project) = | ||
| let visualStudioWorkspace = workspace :?> VisualStudioWorkspace | ||
| let hier = visualStudioWorkspace.GetHierarchy(project.Id) | ||
|
Member
There was a problem hiding this comment. Consider handling |
||
| {new IProvideProjectSite with | ||
| member this.GetProjectSite() = | ||
| let compileItems () = [| for document in project.Documents do yield document.FilePath |] | ||
| let compilerFlags () = [| "" |] | ||
|
Member
There was a problem hiding this comment. Presumably this is the piece that we'll have to address by storing the string in the |
||
| let caption () = project.Name | ||
| let projFileName () = project.FilePath | ||
| let taskProvider = None | ||
| let taskReporter = None | ||
| let targetFrameworkMoniker = "" | ||
| let projectGuid () = project.Id.Id.ToString() | ||
| let creationTime = System.DateTime.Now | ||
|
Member
There was a problem hiding this comment. Consider using UTC - this could go backwards if VS is running when the timezone/DST of the machine changes. |
||
| let assemblyReferences () = | ||
| [| | ||
| for reference in project.ProjectReferences do | ||
| let p = workspace.CurrentSolution.GetProject(reference.ProjectId) | ||
| yield (p.OutputFilePath) | ||
|
Member
There was a problem hiding this comment. Do you want the compiler output path (usually in
Contributor
Author
There was a problem hiding this comment. @Pilchie either works since we need metadata from the built dll. Final might be better if the FCS does magic resolution for dependencies not specified in the project. |
||
| for r in project.MetadataReferences do | ||
| match r with | ||
| | :? PortableExecutableReference as per -> yield per.FilePath | ||
| | :? UnresolvedMetadataReference as umr -> yield umr.Reference | ||
| | _ -> () |] | ||
| { new Microsoft.VisualStudio.FSharp.LanguageService.IProjectSite with | ||
| member __.SourceFilesOnDisk() = compileItems () | ||
| member __.DescriptionOfProject() = caption () | ||
| member __.CompilerFlags() = compilerFlags () | ||
| member __.ProjectFileName() = projFileName () | ||
| member __.ErrorListTaskProvider() = taskProvider | ||
| member __.ErrorListTaskReporter() = taskReporter | ||
| member __.AdviseProjectSiteChanges(_,_) = () | ||
| member __.AdviseProjectSiteCleaned(_,_) = () | ||
| member __.AdviseProjectSiteClosed(_,_) = () | ||
| member __.IsIncompleteTypeCheckEnvironment = false | ||
| member __.TargetFrameworkMoniker = targetFrameworkMoniker | ||
| member __.ProjectGuid = projectGuid () | ||
| member __.LoadTime = creationTime | ||
| member __.ProjectProvider = Some this | ||
| member __.AssemblyReferences() = assemblyReferences () | ||
| } | ||
| interface IVsHierarchy with | ||
| member __.SetSite(psp) = hier.SetSite(psp) | ||
| member __.GetSite(psp) = hier.GetSite(ref psp) | ||
| member __.QueryClose(pfCanClose) = hier.QueryClose(ref pfCanClose) | ||
| member __.Close() = hier.Close() | ||
| member __.GetGuidProperty(itemid, propid, pguid) = hier.GetGuidProperty(itemid, propid, ref pguid) | ||
| member __.SetGuidProperty(itemid, propid, rguid) = hier.SetGuidProperty(itemid, propid, ref rguid) | ||
| member __.GetProperty(itemid, propid, pvar) = hier.GetProperty(itemid, propid, ref pvar) | ||
| member __.SetProperty(itemid, propid, var) = hier.SetProperty(itemid, propid, var) | ||
| member __.GetNestedHierarchy(itemid, iidHierarchyNested, ppHierarchyNested, pitemidNested) = hier.GetNestedHierarchy(itemid, ref iidHierarchyNested, ref ppHierarchyNested, ref pitemidNested) | ||
| member __.GetCanonicalName(itemid, pbstrName) = hier.GetCanonicalName(itemid, ref pbstrName) | ||
| member __.ParseCanonicalName(pszName, pitemid) = hier.ParseCanonicalName(pszName, ref pitemid) | ||
| member __.Unused0() = hier.Unused0() | ||
| member __.AdviseHierarchyEvents(pEventSink, pdwCookie) = hier.AdviseHierarchyEvents(pEventSink, ref pdwCookie) | ||
| member __.UnadviseHierarchyEvents(dwCookie) = hier.UnadviseHierarchyEvents(dwCookie) | ||
| member __.Unused1() = hier.Unused1() | ||
| member __.Unused2() = hier.Unused2() | ||
| member __.Unused3() = hier.Unused3() | ||
| member __.Unused4() = hier.Unused4() | ||
| } | ||
|
|
||
| member this.SetupStandAloneFile(fileName: string, fileContents: string, workspace: VisualStudioWorkspaceImpl, hier: IVsHierarchy) = | ||
|
|
||
| let loadTime = DateTime.Now | ||
|
|
@@ -485,7 +570,7 @@ and | |
|
|
||
| let projectContext = projectContextFactory.CreateProjectContext(FSharpConstants.FSharpLanguageName, projectDisplayName, projectFileName, projectId.Id, hier, null, errorReporter) | ||
| projectContext.AddSourceFile(fileName) | ||
|
|
||
| let project = projectContext :?> AbstractProject | ||
| singleFileProjects.[projectId] <- project | ||
|
|
||
|
|
@@ -502,19 +587,16 @@ and | |
| base.SetupNewTextView(textView) | ||
|
|
||
| let textViewAdapter = package.ComponentModel.GetService<IVsEditorAdaptersFactoryService>() | ||
| match textView.GetBuffer() with | ||
| | (VSConstants.S_OK, textLines) -> | ||
| let filename = VsTextLines.GetFilename textLines | ||
| match VsRunningDocumentTable.FindDocumentWithoutLocking(package.RunningDocumentTable, filename) with | ||
| | Some (hier, _) -> | ||
| match hier with | ||
| | :? IProvideProjectSite as siteProvider when not (IsScript(filename)) -> | ||
| this.SetupProjectFile(siteProvider, this.Workspace, "SetupNewTextView") | ||
| | _ -> | ||
| let fileContents = VsTextLines.GetFileContents(textLines, textViewAdapter) | ||
| this.SetupStandAloneFile(filename, fileContents, this.Workspace, hier) | ||
| | _ -> () | ||
| | _ -> () | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The event tells you the affect projects in these cases, instead of needing to iterate all projects
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Pilchie I have had it both ways. I will go back to per project ... it seems like less overhead.