Merge pull request #866 from filipw/bugfix/extensions-non-existing-path

Error handling when loading assemblies from an external folder
OmniSharp · May 25, 2017 · 81c790b · 81c790b
2 parents 146f9a2 + 8ffc3c8
commit 81c790b
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/OmniSharp.Host/Services/AssemblyLoader.cs b/src/OmniSharp.Host/Services/AssemblyLoader.cs
@@ -38,17 +38,26 @@ public IReadOnlyList<Assembly> LoadAllFrom(string folderPath)
         {
             if (string.IsNullOrWhiteSpace(folderPath)) return Array.Empty<Assembly>();
 
-            var assemblies = new List<Assembly>();
-            foreach (var filePath in Directory.EnumerateFiles(folderPath, "*.dll"))
+            try
             {
-                var assembly = LoadFromPath(filePath);
-                if (assembly != null)
+                var assemblies = new List<Assembly>();
+
+                foreach (var filePath in Directory.EnumerateFiles(folderPath, "*.dll"))
                 {
-                    assemblies.Add(assembly);
+                    var assembly = LoadFromPath(filePath);
+                    if (assembly != null)
+                    {
+                        assemblies.Add(assembly);
+                    }
                 }
-            }
 
-            return assemblies;
+                return assemblies;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, $"An error occurred when attempting to access '{folderPath}'.");
+                return Array.Empty<Assembly>();
+            }
         }
 
         private Assembly LoadFromPath(string assemblyPath)