fix for #2346 (#2408)

* Disconnect() project only after document closed * naming

fix for #2346 (#2408)
* Disconnect() project only after document closed * naming
1e7bb92d · Jakub Majocha · Kevin Ransom (msft) · 30cd23e6 · 1e7bb92d
隐藏空白更改
内联并排

Showing with 8 addition and 4 deletion

vsintegration/src/FSharp.Editor/Common/LanguageService.fs vsintegration/src/FSharp.Editor/Common/LanguageService.fs +8 -4

未找到文件。
--- a/vsintegration/src/FSharp.Editor/Common/LanguageService.fs
+++ b/vsintegration/src/FSharp.Editor/Common/LanguageService.fs
@@ -341,11 +341,15 @@ and
            projectContext.AddSourceFile(fileName)
            
            let project = projectContext :?> AbstractProject
-            let document = project.GetCurrentDocumentFromPath(fileName)
+            let documentId = project.GetCurrentDocumentFromPath(fileName).Id

-            document.Closing.Add(fun _ ->  
-                projectInfoManager.RemoveSingleFileProject(projectId)
-                project.Disconnect())
+            let rec onDocumentClosed = EventHandler<DocumentEventArgs> (fun _ args ->
+                if args.Document.Id = documentId then
+                    projectInfoManager.RemoveSingleFileProject(projectId)
+                    project.Disconnect()
+                    workspace.DocumentClosed.RemoveHandler(onDocumentClosed)
+            )
+            workspace.DocumentClosed.AddHandler(onDocumentClosed)

    override this.ContentTypeName = FSharpCommonConstants.FSharpContentTypeName
    override this.LanguageName = FSharpCommonConstants.FSharpLanguageName