Do not return nulls when getting documents by path

OmniSharp · Sep 8, 2021 · f930f33 · f930f33
1 parent 4f7ed0f
commit f930f33
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/OmniSharp.Roslyn.CSharp/Helpers/LocationExtensions.cs b/src/OmniSharp.Roslyn.CSharp/Helpers/LocationExtensions.cs
@@ -20,15 +20,15 @@ public static QuickFix GetQuickFix(this Location location, OmniSharpWorkspace wo
                 ? location.GetLineSpan()
                 : location.GetMappedLineSpan();
 
-            var documents = workspace.GetDocuments(lineSpan.Path);
-            var sourceText = GetSourceText(location, documents, lineSpan.HasMappedPath);
-            var text = GetLineText(location, sourceText, lineSpan.StartLinePosition.Line);
-
             var fileName = Path.IsPathRooted(lineSpan.Path)
                 ? lineSpan.Path
                 // when a #line directive maps into a separate file using a relative path, get the full path relative to the folder containing the source tree
                 : Path.GetFullPath(Path.Combine(Path.GetDirectoryName(location.SourceTree.FilePath), lineSpan.Path));
 
+            var documents = workspace.GetDocuments(fileName);
+            var sourceText = GetSourceText(location, documents, lineSpan.HasMappedPath);
+            var text = GetLineText(location, sourceText, lineSpan.StartLinePosition.Line);
+
             return new QuickFix
             {
                 Text = text.Trim(),

diff --git a/src/OmniSharp.Roslyn/OmniSharpWorkspace.cs b/src/OmniSharp.Roslyn/OmniSharpWorkspace.cs
@@ -62,12 +62,12 @@ public OmniSharpWorkspace(HostServicesAggregator aggregator, ILoggerFactory logg
 
         private void OnDirectoryRemoved(string path, FileChangeType changeType)
         {
-            if(changeType == FileChangeType.DirectoryDelete)
+            if (changeType == FileChangeType.DirectoryDelete)
             {
                 var docs = CurrentSolution.Projects.SelectMany(x => x.Documents)
                     .Where(x => x.FilePath.StartsWith(path + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase));
 
-                foreach(var doc in docs)
+                foreach (var doc in docs)
                 {
                     OnDocumentRemoved(doc.Id);
                 }
@@ -340,7 +340,8 @@ public IEnumerable<Document> GetDocuments(string filePath)
         {
             return CurrentSolution
                 .GetDocumentIdsWithFilePath(filePath)
-                .Select(id => CurrentSolution.GetDocument(id));
+                .Select(id => CurrentSolution.GetDocument(id))
+                .OfType<Document>();
         }
 
         public Document GetDocument(string filePath)