return empty collections

OmniSharp · May 4, 2021 · b41a1bd · b41a1bd
1 parent c1d5675
commit b41a1bd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Structure/BlockStructureService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Structure/BlockStructureService.cs
@@ -56,7 +56,7 @@ public async Task<BlockStructureResponse> Handle(BlockStructureRequest request)
             var document = await _workspace.GetDocumentFromFullProjectModelAsync(request.FileName);
             if (document == null)
             {
-                return new BlockStructureResponse();
+                return new BlockStructureResponse { Spans = Array.Empty<CodeFoldingBlock>() };
             }
 
             var text = await document.GetTextAsync();

diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Structure/CodeStructureService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Structure/CodeStructureService.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Composition;
 using System.Threading.Tasks;
@@ -36,7 +37,7 @@ public async Task<CodeStructureResponse> Handle(CodeStructureRequest request)
             var document = await _workspace.GetDocumentFromFullProjectModelAsync(request.FileName);
             if (document == null)
             {
-                return new CodeStructureResponse();
+                return new CodeStructureResponse { Elements = Array.Empty<CodeElement>() };
             }
 
             var elements = await GetCodeElementsAsync(document);

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/BlockStructureFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/BlockStructureFacts.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using OmniSharp.Models.V2;
@@ -46,14 +47,14 @@ public async Task NonExistingFile()
         {
             var request = new BlockStructureRequest
             {
-                FileName = "foo.cs"
+                FileName = $"{Guid.NewGuid().ToString("N")}.cs"
             };
 
             var requestHandler = GetRequestHandler(SharedOmniSharpTestHost);
             var response = await requestHandler.Handle(request);
 
             Assert.NotNull(response);
-            Assert.Null(response.Spans);
+            Assert.Empty(response.Spans);
         }
 
         [Fact]

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/CodeStructureFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/CodeStructureFacts.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using OmniSharp.Mef;
@@ -418,14 +419,14 @@ public async Task NonExistingFile()
         {
             var request = new CodeStructureRequest
             {
-                FileName = "foo.cs"
+                FileName = $"{Guid.NewGuid().ToString("N")}.cs"
             };
 
             var requestHandler = GetRequestHandler(SharedOmniSharpTestHost);
             var response = await requestHandler.Handle(request);
 
             Assert.NotNull(response);
-            Assert.Null(response.Elements);
+            Assert.Empty(response.Elements);
         }
 
         private static void AssertRange(CodeElement elementC, TestContent content, string contentSpanName, string elementRangeName)