Update CodeStructureService with FileScoped Namespace support

OmniSharp · Sep 2, 2021 · 2eb2e13 · 2eb2e13
1 parent 1ff2a19
commit 2eb2e13
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Structure/CodeStructureService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Structure/CodeStructureService.cs
@@ -85,7 +85,7 @@ private IEnumerable<CodeElement> CreateCodeElements(SyntaxNode node, SourceText
                 case EnumDeclarationSyntax enumDeclaration:
                     yield return CreateCodeElement(enumDeclaration, text, semanticModel);
                     break;
-                case NamespaceDeclarationSyntax namespaceDeclaration:
+                case BaseNamespaceDeclarationSyntax namespaceDeclaration:
                     yield return CreateCodeElement(namespaceDeclaration, text, semanticModel);
                     break;
                 case BaseMethodDeclarationSyntax baseMethodDeclaration:
@@ -186,7 +186,7 @@ private CodeElement CreateCodeElement(EnumDeclarationSyntax enumDeclaration, Sou
             return builder.ToCodeElement();
         }
 
-        private CodeElement CreateCodeElement(NamespaceDeclarationSyntax namespaceDeclaration, SourceText text, SemanticModel semanticModel)
+        private CodeElement CreateCodeElement(BaseNamespaceDeclarationSyntax namespaceDeclaration, SourceText text, SemanticModel semanticModel)
         {
             var symbol = semanticModel.GetDeclaredSymbol(namespaceDeclaration);
             if (symbol == null)

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/CodeStructureFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/CodeStructureFacts.cs
@@ -71,6 +71,33 @@ struct S { }
             AssertElement(children[4], SymbolKinds.Struct, "S", "N.S");
         }
 
+        [Fact]
+        public async Task AllTypesInFileScopedNamespace()
+        {
+            const string source = @"
+namespace N;
+
+class C { }
+delegate void D(int i, ref string s);
+enum E { One, Two, Three }
+interface I { }
+struct S { }
+";
+
+            var response = await GetCodeStructureAsync(source);
+
+            var elementN = Assert.Single(response.Elements);
+            AssertElement(elementN, SymbolKinds.Namespace, "N", "N");
+
+            var children = elementN.Children;
+            Assert.Equal(5, children.Count);
+            AssertElement(children[0], SymbolKinds.Class, "C", "N.C");
+            AssertElement(children[1], SymbolKinds.Delegate, "D", "N.D");
+            AssertElement(children[2], SymbolKinds.Enum, "E", "N.E");
+            AssertElement(children[3], SymbolKinds.Interface, "I", "N.I");
+            AssertElement(children[4], SymbolKinds.Struct, "S", "N.S");
+        }
+
         [Fact]
         public async Task GenericTypesInNamespace()
         {