Comment out project updated and removed events because of AVs --- the…

… AVs will need fixing
dotnet · Sep 27, 2017 · 216dca9 · 216dca9
1 parent 560622c
commit 216dca9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
@@ -183,18 +183,21 @@ type internal FSharpProjectOptionsManager
         match projectTable.TryGetValue(projectId) with
         | true, ((_referencedProjects, options), _) ->
             let (sourcePaths,_,otherOptions) = this.CommandLineOptions.GetOptionsWithProjectId(projectId)
-            Some { ProjectFileName                   = options.ProjectFileName
-                   SourceFiles                       = if sourcePaths.Length = 0 then options.SourceFiles else sourcePaths
-                   OtherOptions                      = if otherOptions.Length = 0 then options.OtherOptions else otherOptions
-                   ReferencedProjects                = options.ReferencedProjects
-                   IsIncompleteTypeCheckEnvironment  = options.IsIncompleteTypeCheckEnvironment
-                   UseScriptResolutionRules          = options.UseScriptResolutionRules
-                   LoadTime                          = options.LoadTime
-                   UnresolvedReferences              = options.UnresolvedReferences
-                   OriginalLoadReferences            = options.OriginalLoadReferences
-                   ExtraProjectInfo                  = options.ExtraProjectInfo
-                   Stamp                             = options.Stamp
-                 }
+            if sourcePaths.Length = 0 || otherOptions.Length = 0 then
+                Some options
+            else
+                Some { ProjectFileName                   = options.ProjectFileName
+                       SourceFiles                       = if sourcePaths.Length = 0 then options.SourceFiles else sourcePaths
+                       OtherOptions                      = if otherOptions.Length = 0 then options.OtherOptions else otherOptions
+                       ReferencedProjects                = options.ReferencedProjects
+                       IsIncompleteTypeCheckEnvironment  = options.IsIncompleteTypeCheckEnvironment
+                       UseScriptResolutionRules          = options.UseScriptResolutionRules
+                       LoadTime                          = options.LoadTime
+                       UnresolvedReferences              = options.UnresolvedReferences
+                       OriginalLoadReferences            = options.OriginalLoadReferences
+                       ExtraProjectInfo                  = options.ExtraProjectInfo
+                       Stamp                             = options.Stamp
+                     }
         | _ -> None
 
     /// Get the exact options for a document or project
@@ -374,10 +377,10 @@ type
 
         let workspaceChanged (args:WorkspaceChangeEventArgs) =
             match args.Kind with
-            | WorkspaceChangeKind.ProjectAdded   -> this.OnProjectAdded(args.ProjectId,   args.NewSolution)
-            | WorkspaceChangeKind.ProjectChanged -> this.OnProjectChanged(args.ProjectId,   args.NewSolution)
-            | WorkspaceChangeKind.ProjectReloaded -> this.OnProjectReloaded(args.ProjectId,   args.NewSolution)
-            | WorkspaceChangeKind.ProjectRemoved -> this.OnProjectRemoved(args.ProjectId,   args.NewSolution)
+            | WorkspaceChangeKind.ProjectAdded    -> this.OnProjectAdded(args.ProjectId,    args.NewSolution)
+            | WorkspaceChangeKind.ProjectChanged  -> this.OnProjectChanged(args.ProjectId,  args.NewSolution)
+            | WorkspaceChangeKind.ProjectReloaded -> this.OnProjectReloaded(args.ProjectId, args.NewSolution)
+//            | WorkspaceChangeKind.ProjectRemoved  -> this.OnProjectRemoved(args.ProjectId,  args.NewSolution)
             | _ -> ()
 
         this.Workspace.Options <- this.Workspace.Options.WithChangedOption(Completion.CompletionOptions.BlockForCompletionItems, FSharpConstants.FSharpLanguageName, false)

diff --git a/vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs b/vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs
@@ -123,7 +123,7 @@ type CommandLineOptions (isEmpty:bool) =
         | _ -> [||], [||], [||]
 
     member this.SetOptionsWithProjectId(projectId:ProjectId, sourcePaths:string[], referencePaths:string[], options:string[]) =
-        if isEmpty then commandLineOptions.[projectId] <- (sourcePaths, referencePaths, options)
+        if not isEmpty then commandLineOptions.[projectId] <- (sourcePaths, referencePaths, options)
 
     static member Empty with get () = emptyCommandLineOptions.Value