Show additional pieces of information in the preview changes dialog to make it...

Show additional pieces of information in the preview changes dialog to make it clearer about what change will actually be happening.

src/EditorFeatures/Core/Implementation/Preview/PreviewFactoryService.cs

@@ -88,107 +88,107 @@ public SolutionPreviewResult GetSolutionPreviews(Solution oldSolution, Solution
                     foreach (var documentId in projectChanges.GetChangedDocuments())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(documentId.ProjectId, documentId, (c) =>
+                        previewItems.Add(new SolutionPreviewItem(documentId.ProjectId, documentId, c =>
                             CreateChangedDocumentPreviewViewAsync(oldSolution.GetDocument(documentId), newSolution.GetDocument(documentId), zoomLevel, c)));
                     }
 
                     foreach (var documentId in projectChanges.GetAddedDocuments())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(documentId.ProjectId, documentId, (c) =>
+                        previewItems.Add(new SolutionPreviewItem(documentId.ProjectId, documentId, c =>
                             CreateAddedDocumentPreviewViewAsync(newSolution.GetDocument(documentId), zoomLevel, c)));
                     }
 
                     foreach (var documentId in projectChanges.GetRemovedDocuments())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, documentId, (c) =>
+                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, documentId, c =>
                             CreateRemovedDocumentPreviewViewAsync(oldSolution.GetDocument(documentId), zoomLevel, c)));
                     }
 
                     foreach (var documentId in projectChanges.GetChangedAdditionalDocuments())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(documentId.ProjectId, documentId, (c) =>
+                        previewItems.Add(new SolutionPreviewItem(documentId.ProjectId, documentId, c =>
                             CreateChangedAdditionalDocumentPreviewViewAsync(oldSolution.GetAdditionalDocument(documentId), newSolution.GetAdditionalDocument(documentId), zoomLevel, c)));
                     }
 
                     foreach (var documentId in projectChanges.GetAddedAdditionalDocuments())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(documentId.ProjectId, documentId, (c) =>
+                        previewItems.Add(new SolutionPreviewItem(documentId.ProjectId, documentId, c =>
                             CreateAddedAdditionalDocumentPreviewViewAsync(newSolution.GetAdditionalDocument(documentId), zoomLevel, c)));
                     }
 
                     foreach (var documentId in projectChanges.GetRemovedAdditionalDocuments())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, documentId, (c) =>
+                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, documentId, c =>
                             CreateRemovedAdditionalDocumentPreviewViewAsync(oldSolution.GetAdditionalDocument(documentId), zoomLevel, c)));
                     }
 
                     foreach (var metadataReference in projectChanges.GetAddedMetadataReferences())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null, (c) =>
-                            Task.FromResult<object>(string.Format(EditorFeaturesResources.AddingReferenceTo, metadataReference.Display, oldProject.Name))));
+                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null,
+                            string.Format(EditorFeaturesResources.AddingReferenceTo, metadataReference.Display, oldProject.Name)));
                     }
 
                     foreach (var metadataReference in projectChanges.GetRemovedMetadataReferences())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null, (c) =>
-                            Task.FromResult<object>(string.Format(EditorFeaturesResources.RemovingReferenceFrom, metadataReference.Display, oldProject.Name))));
+                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null, 
+                            string.Format(EditorFeaturesResources.RemovingReferenceFrom, metadataReference.Display, oldProject.Name)));
                     }
 
                     foreach (var projectReference in projectChanges.GetAddedProjectReferences())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null, (c) =>
-                            Task.FromResult<object>(string.Format(EditorFeaturesResources.AddingReferenceTo, newSolution.GetProject(projectReference.ProjectId).Name, oldProject.Name))));
+                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null, 
+                            string.Format(EditorFeaturesResources.AddingReferenceTo, newSolution.GetProject(projectReference.ProjectId).Name, oldProject.Name)));
                     }
 
                     foreach (var projectReference in projectChanges.GetRemovedProjectReferences())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null, (c) =>
-                            Task.FromResult<object>(string.Format(EditorFeaturesResources.RemovingReferenceFrom, oldSolution.GetProject(projectReference.ProjectId).Name, oldProject.Name))));
+                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null, 
+                            string.Format(EditorFeaturesResources.RemovingReferenceFrom, oldSolution.GetProject(projectReference.ProjectId).Name, oldProject.Name)));
                     }
 
                     foreach (var analyzer in projectChanges.GetAddedAnalyzerReferences())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null, (c) =>
-                            Task.FromResult<object>(string.Format(EditorFeaturesResources.AddingAnalyzerReferenceTo, analyzer.Display, oldProject.Name))));
+                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null, 
+                            string.Format(EditorFeaturesResources.AddingAnalyzerReferenceTo, analyzer.Display, oldProject.Name)));
                     }
 
                     foreach (var analyzer in projectChanges.GetRemovedAnalyzerReferences())
                     {
                         cancellationToken.ThrowIfCancellationRequested();
-                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null, (c) =>
-                            Task.FromResult<object>(string.Format(EditorFeaturesResources.RemovingAnalyzerReferenceFrom, analyzer.Display, oldProject.Name))));
+                        previewItems.Add(new SolutionPreviewItem(oldProject.Id, null, 
+                            string.Format(EditorFeaturesResources.RemovingAnalyzerReferenceFrom, analyzer.Display, oldProject.Name)));
                     }
                 }
 
                 foreach (var project in solutionChanges.GetAddedProjects())
                 {
                     cancellationToken.ThrowIfCancellationRequested();
-                    previewItems.Add(new SolutionPreviewItem(project.Id, null, (c) =>
-                        Task.FromResult<object>(string.Format(EditorFeaturesResources.AddingProject, project.Name))));
+                    previewItems.Add(new SolutionPreviewItem(project.Id, null, 
+                        string.Format(EditorFeaturesResources.AddingProject, project.Name)));
                 }
 
                 foreach (var project in solutionChanges.GetRemovedProjects())
                 {
                     cancellationToken.ThrowIfCancellationRequested();
-                    previewItems.Add(new SolutionPreviewItem(project.Id, null, (c) =>
-                        Task.FromResult<object>(string.Format(EditorFeaturesResources.RemovingProject, project.Name))));
+                    previewItems.Add(new SolutionPreviewItem(project.Id, null, 
+                        string.Format(EditorFeaturesResources.RemovingProject, project.Name)));
                 }
 
-                foreach (var projectChanges in solutionChanges.GetProjectChanges().Where(pc => pc.OldProject.AllProjectReferences != pc.NewProject.AllProjectReferences))
+                foreach (var projectChanges in solutionChanges.GetProjectChanges().Where(ProjectReferencesChanged))
                 {
                     cancellationToken.ThrowIfCancellationRequested();
-                    previewItems.Add(new SolutionPreviewItem(projectChanges.OldProject.Id, null, (c) =>
-                        Task.FromResult<object>(string.Format(EditorFeaturesResources.ChangingProjectReferencesFor, projectChanges.OldProject.Name))));
+                    previewItems.Add(new SolutionPreviewItem(projectChanges.OldProject.Id, null, 
+                        string.Format(EditorFeaturesResources.ChangingProjectReferencesFor, projectChanges.OldProject.Name)));
                 }
 
                 changeSummary = new SolutionChangeSummary(oldSolution, newSolution, solutionChanges);
@@ -197,6 +197,29 @@ public SolutionPreviewResult GetSolutionPreviews(Solution oldSolution, Solution
             return new SolutionPreviewResult(previewItems, changeSummary);
         }
 
+        private bool ProjectReferencesChanged(ProjectChanges projectChanges)
+        {
+            var oldProjectReferences = projectChanges.OldProject.ProjectReferences.ToDictionary(r => r.ProjectId);
+            var newProjectReferences = projectChanges.NewProject.ProjectReferences.ToDictionary(r => r.ProjectId);
+
+            // These are the set of project reference that remained in the project. We don't care 
+            // about project references that were added or removed.  Those will already be reported.
+            var preservedProjectIds = oldProjectReferences.Keys.Intersect(newProjectReferences.Keys);
+
+            foreach (var projectId in preservedProjectIds)
+            {
+                var oldProjectReference = oldProjectReferences[projectId];
+                var newProjectReference = newProjectReferences[projectId];
+
+                if (!oldProjectReference.Equals(newProjectReference))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         public Task<object> CreateAddedDocumentPreviewViewAsync(Document document, CancellationToken cancellationToken)
         {
             return CreateAddedDocumentPreviewViewAsync(document, DefaultZoomLevel, cancellationToken);

src/EditorFeatures/Core/Implementation/SolutionPreviewItem.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor
 {
@@ -11,6 +12,7 @@ internal class SolutionPreviewItem
         public readonly ProjectId ProjectId;
         public readonly DocumentId DocumentId;
         public readonly Func<CancellationToken, Task<object>> LazyPreview;
+        public readonly string Text;
 
         /// <summary>
         /// Construct an instance of <see cref="SolutionPreviewItem"/>
@@ -27,5 +29,13 @@ public SolutionPreviewItem(ProjectId projectId, DocumentId documentId, Func<Canc
             DocumentId = documentId;
             LazyPreview = lazyPreview;
         }
+
+        public SolutionPreviewItem(ProjectId projectId, DocumentId documentId, string text)
+        {
+            ProjectId = projectId;
+            DocumentId = documentId;
+            Text = text;
+            LazyPreview = c => Task.FromResult<object>(text);
+        }
     }
 }

src/EditorFeatures/Core/Implementation/SolutionPreviewResult.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.VisualStudio.Text.Differencing;
 
 namespace Microsoft.CodeAnalysis.Editor
 {
@@ -86,7 +90,86 @@ public async Task<object> TakeNextPreviewAsync(DocumentId preferredDocumentId =
                 preview = await TakeNextPreviewAsync(preferredDocumentId, preferredProjectId, cancellationToken).ConfigureAwait(true);
             }
 
+            preview = AddSuccessiveTextChanges(preview, cancellationToken);
+
+            return preview;
+        }
+
+        private object AddSuccessiveTextChanges(object preview, CancellationToken cancellationToken)
+        {
+            if (!(preview is FrameworkElement || preview is string || preview is IWpfDifferenceViewer))
+            {
+                return preview;
+            }
+
+            Grid grid = null;
+            var added = 0;
+            while (_previews.Count > 0 && _previews[0].Text != null)
+            {
+                grid = CreateGrid(preview, grid);
+
+                if (added == 3)
+                {
+                    break;
+                }
+
+                var nextChild = CreateTextBlock(_previews[0].Text);
+                var rowDefinition = new RowDefinition() { Height =  GridLength.Auto };
+                grid.RowDefinitions.Add(rowDefinition);
+
+                Grid.SetRow(nextChild, grid.RowDefinitions.IndexOf(rowDefinition));
+                grid.Children.Add(nextChild);
+
+                _previews.RemoveAt(0);
+                added++;
+            }
+
+            if (grid != null)
+            {
+                preview = grid;
+            }
+
             return preview;
         }
+
+        private Grid CreateGrid(object preview, Grid grid)
+        {
+            if (grid == null)
+            {
+                grid = new Grid();
+                FrameworkElement firstChild;
+                if (preview is string)
+                {
+                    firstChild = CreateTextBlock(preview);
+                }
+                else if (preview is FrameworkElement)
+                {
+                    firstChild = (FrameworkElement)preview;
+                }
+                else
+                {
+                    var diffView = (IWpfDifferenceViewer)preview;
+                    firstChild = diffView.VisualElement;
+                    grid.Background = diffView.InlineView.Background;
+                }
+
+                var rowDefinition = new RowDefinition();
+                grid.RowDefinitions.Add(rowDefinition);
+                Grid.SetRow(firstChild, grid.RowDefinitions.IndexOf(rowDefinition));
+                grid.Children.Add(firstChild);
+
+                grid.Width = firstChild.Width;
+            }
+
+            return grid;
+        }
+
+        private FrameworkElement CreateTextBlock(object text) =>
+            new TextBlock()
+            {
+                Text = (string)text,
+                VerticalAlignment = VerticalAlignment.Center,
+                TextWrapping = TextWrapping.Wrap
+            };
     }
-}
+}
\ No newline at end of file

src/Features/Core/Portable/CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs

@@ -183,7 +183,7 @@ private async Task FindResultsInUnreferencedMetadataReferences(Project project,
             var newMetadataReferences = otherProject.MetadataReferences.OfType<PortableExecutableReference>();
 
             Compilation compilation = null;
-            foreach (var reference in seenReferences)
+            foreach (var reference in newMetadataReferences)
             {
                 // Make sure we don't check the same metadata reference multiple times from 
                 // different projects.