Merge branch 'rubberduck-vba/next' into 5191_I_thru_Z

Author: BZngr

Rubberduck.Core/UI/Converters/ImageSourceConverter.cs

@@ -12,17 +12,19 @@ public abstract class ImageSourceConverter : IValueConverter
     {
         protected static ImageSource ToImageSource(Image source)
         {
-            var ms = new MemoryStream();
+            using (var ms = new MemoryStream())
+            {
+                ((Bitmap) source).Save(ms, System.Drawing.Imaging.ImageFormat.Png);
+                var image = new BitmapImage();
+                image.BeginInit();
+                image.CacheOption = BitmapCacheOption.OnLoad;
+                ms.Seek(0, SeekOrigin.Begin);
+                image.StreamSource = ms;
+                image.EndInit();
+                image.Freeze();
 
-            ((Bitmap)source).Save(ms, System.Drawing.Imaging.ImageFormat.Png);
-            var image = new BitmapImage();
-            image.BeginInit();
-            ms.Seek(0, SeekOrigin.Begin);
-            image.StreamSource = ms;
-            image.EndInit();
-            image.Freeze();
-
-            return image;
+                return image;
+            }
         }
 
         public abstract object Convert(object value, Type targetType, object parameter, CultureInfo culture);

Rubberduck.Parsing/VBA/ParseCoordinator.cs

@@ -239,10 +239,7 @@ private void ExecuteCommonParseActivities(IReadOnlyCollection<QualifiedModuleNam
             _parserStateManager.SetStatusAndFireStateChanged(this, ParserState.LoadingReference, token);
             token.ThrowIfCancellationRequested();
 
-            RefreshUserComProjects(toParse, newProjectIds);
-            token.ThrowIfCancellationRequested();
-
-            SyncDeclarationsFromUserComProjects(toParse, token, toReresolveReferences);
+            ProcessUserComProjects(ref token, ref toParse, ref toReresolveReferences, ref newProjectIds);
 
             SyncComReferences(toParse, token, toReresolveReferences);
             token.ThrowIfCancellationRequested();
@@ -337,6 +334,17 @@ private void ExecuteCommonParseActivities(IReadOnlyCollection<QualifiedModuleNam
             token.ThrowIfCancellationRequested();
         }
 
+        //TODO: Remove the conditional compilation after loading from typelibs actually works.
+        //TODO: Improve the handling to avoid host crashing. See https://github.com/rubberduck-vba/Rubberduck/issues/5217
+        [Conditional("LOAD_USER_COM_PROJECTS")]
+        private void ProcessUserComProjects(ref CancellationToken token, ref IReadOnlyCollection<QualifiedModuleName> toParse, ref HashSet<QualifiedModuleName> toReresolveReferences, ref IReadOnlyCollection<string> newProjectIds)
+        {
+            RefreshUserComProjects(toParse, newProjectIds);
+            token.ThrowIfCancellationRequested();
+
+            SyncDeclarationsFromUserComProjects(toParse, token, toReresolveReferences);
+        }
+
         private void SyncComReferences(IReadOnlyCollection<QualifiedModuleName> toParse, CancellationToken token, HashSet<QualifiedModuleName> toReresolveReferences)
         {
             _parsingStageService.SyncComReferences(token);