Fix

Author: CyrusNajmabadi

src/Workspaces/Core/Portable/Workspace/ProjectSystem/ProjectSystemProject.cs

@@ -930,47 +930,54 @@ public void AddAnalyzerReference(string fullPath)
             foreach (var mappedFullPath in mappedPaths)
             {
                 if (_analyzerPathsToAnalyzers.ContainsKey(mappedFullPath))
-                {
                     throw new ArgumentException($"'{fullPath}' has already been added to this project.", nameof(fullPath));
-                }
             }
 
-            foreach (var mappedFullPath in mappedPaths)
+            if (_activeBatchScopes > 0)
             {
-                // Are we adding one we just recently removed? If so, we can just keep using that one, and avoid removing
-                // it once we apply the batch
-                var analyzerPendingRemoval = _analyzersRemovedInBatch.FirstOrDefault(a => a.FullPath == mappedFullPath);
-                if (analyzerPendingRemoval != null)
-                {
-                    _analyzersRemovedInBatch.Remove(analyzerPendingRemoval);
-                    _analyzerPathsToAnalyzers.Add(mappedFullPath, analyzerPendingRemoval);
-                }
-                else
+                foreach (var mappedFullPath in mappedPaths)
                 {
-                    // Nope, we actually need to make a new one.
-                    var analyzerReference = new AnalyzerFileReference(mappedFullPath, _analyzerAssemblyLoader);
-
-                    _analyzerPathsToAnalyzers.Add(mappedFullPath, analyzerReference);
-
-                    if (_activeBatchScopes > 0)
+                    // Are we adding one we just recently removed? If so, we can just keep using that one, and avoid removing
+                    // it once we apply the batch
+                    var analyzerPendingRemoval = _analyzersRemovedInBatch.FirstOrDefault(a => a.FullPath == mappedFullPath);
+                    if (analyzerPendingRemoval != null)
                     {
-                        _analyzersAddedInBatch.Add(analyzerReference);
+                        _analyzersRemovedInBatch.Remove(analyzerPendingRemoval);
+                        _analyzerPathsToAnalyzers.Add(mappedFullPath, analyzerPendingRemoval);
                     }
                     else
                     {
-                        _projectSystemProjectFactory.ApplyChangeToWorkspace(w => w.OnAnalyzerReferenceAdded(Id, analyzerReference));
+                        // Nope, we actually need to make a new one.
+                        var analyzerReference = new AnalyzerFileReference(mappedFullPath, _analyzerAssemblyLoader);
+
+                        _analyzersAddedInBatch.Add(analyzerReference);
+                        _analyzerPathsToAnalyzers.Add(mappedFullPath, analyzerReference);
                     }
                 }
             }
+            else
+            {
+                _projectSystemProjectFactory.ApplyChangeToWorkspaceWithProjectUpdateState((w, projectUpdateState) =>
+                {
+                    foreach (var mappedFullPath in mappedPaths)
+                    {
+                        var analyzerReference = new AnalyzerFileReference(mappedFullPath, _analyzerAssemblyLoader);
+                        _analyzerPathsToAnalyzers.Add(mappedFullPath, analyzerReference);
+                        w.OnAnalyzerReferenceAdded(Id, analyzerReference);
+
+                        projectUpdateState = projectUpdateState.WithIncrementalAnalyzerReferenceAdded(analyzerReference);
+                    }
+
+                    return projectUpdateState;
+                });
+            }
         }
     }
 
     public void RemoveAnalyzerReference(string fullPath)
     {
         if (string.IsNullOrEmpty(fullPath))
-        {
             throw new ArgumentException("message", nameof(fullPath));
-        }
 
         var mappedPaths = GetMappedAnalyzerPaths(fullPath);
 
@@ -980,28 +987,38 @@ public void RemoveAnalyzerReference(string fullPath)
             foreach (var mappedFullPath in mappedPaths)
             {
                 if (!_analyzerPathsToAnalyzers.ContainsKey(mappedFullPath))
-                {
                     throw new ArgumentException($"'{fullPath}' is not an analyzer of this project.", nameof(fullPath));
-                }
             }
 
-            foreach (var mappedFullPath in mappedPaths)
+            if (_activeBatchScopes > 0)
             {
-                var analyzerReference = _analyzerPathsToAnalyzers[mappedFullPath];
+                foreach (var mappedFullPath in mappedPaths)
+                {
+                    var analyzerReference = _analyzerPathsToAnalyzers[mappedFullPath];
 
-                _analyzerPathsToAnalyzers.Remove(mappedFullPath);
+                    _analyzerPathsToAnalyzers.Remove(mappedFullPath);
 
-                if (_activeBatchScopes > 0)
-                {
                     // This analyzer may be one we've just added in the same batch; in that case, just don't add it in
                     // the first place.
                     if (!_analyzersAddedInBatch.Remove(analyzerReference))
                         _analyzersRemovedInBatch.Add(analyzerReference);
                 }
-                else
+            }
+            else
+            {
+                _projectSystemProjectFactory.ApplyChangeToWorkspaceWithProjectUpdateState((w, projectUpdateState) =>
                 {
-                    _projectSystemProjectFactory.ApplyChangeToWorkspace(w => w.OnAnalyzerReferenceRemoved(Id, analyzerReference));
-                }
+                    foreach (var mappedFullPath in mappedPaths)
+                    {
+                        var analyzerReference = _analyzerPathsToAnalyzers[mappedFullPath];
+                        _analyzerPathsToAnalyzers.Remove(mappedFullPath);
+
+                        w.OnAnalyzerReferenceRemoved(Id, analyzerReference);
+                        projectUpdateState = projectUpdateState.WithIncrementalAnalyzerReferenceRemoved(analyzerReference);
+                    }
+
+                    return projectUpdateState;
+                });
             }
         }
     }