Merge pull request #4650 from comintern/refs

Locked references removal fix

Author: retailcoder

Rubberduck.Core/AddRemoveReferences/ReferenceModel.cs

@@ -8,7 +8,6 @@
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.AddRemoveReferences
 {
@@ -129,6 +128,7 @@ public bool IsPinned
         public bool IsRecent { get; set; }
         public bool IsRegistered { get; set; }
         public bool IsReferenced { get; set; }
+        public bool IsUsed { get; set; }
 
         public int? Priority { get; set; }
 

Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesPresenterFactory.cs

@@ -55,61 +55,83 @@ public AddRemoveReferencesPresenter Create(ProjectDeclaration project)
                 return null;
             }
 
-            var refs = new Dictionary<RegisteredLibraryKey, RegisteredLibraryInfo>();
-            // Iterating the returned libraries here instead of just .ToDictionary() using because we can't trust that the registry doesn't contain errors.
-            foreach (var reference in _finder.FindRegisteredLibraries())
-            {
-                if (refs.ContainsKey(reference.UniqueId))
-                {
-                    _logger.Warn($"Duplicate registry definition for {reference.Guid} version {reference.Version}.");
-                    continue;
-                }
-                refs.Add(reference.UniqueId, reference);
-            }
+            AddRemoveReferencesModel model = null;
 
-            var models = new Dictionary<RegisteredLibraryKey, ReferenceModel>();
-            using (var references = project.Project?.References)
+            try
             {
-                if (references is null)
+                Cursor.Current = Cursors.WaitCursor;
+
+                var refs = new Dictionary<RegisteredLibraryKey, RegisteredLibraryInfo>();
+                // Iterating the returned libraries here instead of just .ToDictionary() using because we can't trust that the registry doesn't contain errors.
+                foreach (var reference in _finder.FindRegisteredLibraries())
                 {
-                    return null;
+                    if (refs.ContainsKey(reference.UniqueId))
+                    {
+                        _logger.Warn(
+                            $"Duplicate registry definition for {reference.Guid} version {reference.Version}.");
+                        continue;
+                    }
+
+                    refs.Add(reference.UniqueId, reference);
                 }
-                var priority = 1;
-                foreach (var reference in references)
-                {
-                    var guid = Guid.TryParse(reference.Guid, out var result) ? result : Guid.Empty;
-                    var libraryId = new RegisteredLibraryKey(guid, reference.Major, reference.Minor);
 
-                    if (refs.ContainsKey(libraryId))
+                var models = new Dictionary<RegisteredLibraryKey, ReferenceModel>();
+                using (var references = project.Project?.References)
+                {
+                    if (references is null)
                     {
-                        // TODO: If for some reason the VBA reference is broken, we could technically use this to repair it. Just a thought...
-                        models.Add(libraryId, new ReferenceModel(refs[libraryId], reference, priority++));
+                        return null;
                     }
-                    else // These should all be either VBA projects or irreparably broken.
+
+                    var priority = 1;
+                    foreach (var reference in references)
                     {
-                        models.Add(libraryId, new ReferenceModel(reference, priority++));
+                        var guid = Guid.TryParse(reference.Guid, out var result) ? result : Guid.Empty;
+                        var libraryId = new RegisteredLibraryKey(guid, reference.Major, reference.Minor);
+
+                        // TODO: If for some reason the VBA reference is broken, we could technically use this to repair it. Just a thought...
+                        var adding = refs.ContainsKey(libraryId)
+                            ? new ReferenceModel(refs[libraryId], reference, priority++)
+                            : new ReferenceModel(reference, priority++);
+
+                        adding.IsUsed = adding.IsBuiltIn ||
+                                        _state.DeclarationFinder.IsReferenceUsedInProject(project,
+                                            adding.ToReferenceInfo());
+
+                        models.Add(libraryId, adding);
+                        reference.Dispose();
                     }
-                    reference.Dispose();
                 }
-            }
 
-            foreach (var reference in refs.Where(library =>
-                (_use64BitPaths || library.Value.Has32BitVersion) &&
-                !models.ContainsKey(library.Key)))
+                foreach (var reference in refs.Where(library =>
+                    (_use64BitPaths || library.Value.Has32BitVersion) &&
+                    !models.ContainsKey(library.Key)))
+                {
+                    models.Add(reference.Key, new ReferenceModel(reference.Value));
+                }
+
+                var settings = _settings.Create();
+                model = new AddRemoveReferencesModel(project, models.Values, settings);
+                if (AddRemoveReferencesViewModel.HostHasProjects)
+                {
+                    model.References.AddRange(GetUserProjectFolderModels(model.Settings).Where(proj =>
+                        !model.References.Any(item =>
+                            item.FullPath.Equals(proj.FullPath, StringComparison.OrdinalIgnoreCase))));
+                }
+            }
+            catch (Exception ex)
             {
-                models.Add(reference.Key, new ReferenceModel(reference.Value));
+                _logger.Warn(ex, "Unexpected exception attempting to create AddRemoveReferencesModel.");
             }
-
-            var settings = _settings.Create();
-            var model = new AddRemoveReferencesModel(project, models.Values, settings);
-            if (AddRemoveReferencesViewModel.HostHasProjects)
+            finally
             {
-                model.References.AddRange(GetUserProjectFolderModels(model.Settings).Where(proj =>
-                    !model.References.Any(item =>
-                        item.FullPath.Equals(proj.FullPath, StringComparison.OrdinalIgnoreCase))));
+                Cursor.Current = Cursors.Default;
             }
 
-            return new AddRemoveReferencesPresenter(new AddRemoveReferencesDialog(new AddRemoveReferencesViewModel(model, _reconciler, _browser)));         
+            return (model != null)
+                ? new AddRemoveReferencesPresenter(
+                    new AddRemoveReferencesDialog(new AddRemoveReferencesViewModel(model, _reconciler, _browser)))
+                : null;                 
         }
 
         private IEnumerable<ReferenceModel> GetUserProjectFolderModels(IReferenceSettings settings)

Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesViewModel.cs

@@ -115,7 +115,7 @@ public AddRemoveReferencesViewModel(IAddRemoveReferencesModel model, IReferenceR
 
         public string ProjectCaption => string.IsNullOrEmpty(Model?.Project?.IdentifierName)
             ? RubberduckUI.References_Caption
-            : string.Format(RubberduckUI.References_CaptionTemplate, Model.Project.IdentifierName);
+            : string.Format(RubberduckUI.References_CaptionTemplate, Model.Project.ProjectDisplayName);
 
         /// <summary>
         /// The IAddRemoveReferencesModel for the view.
@@ -212,7 +212,7 @@ private void ExecuteAddCommand(object parameter)
         /// <param name="parameter">Ignored</param>
         private void ExecuteRemoveCommand(object parameter)
         {
-            if (SelectedReference == null)
+            if (SelectedReference == null || SelectedReference.IsBuiltIn)
             {
                 return;
             }