C#: Make support for FileScoped namespace declaration in the extrator.

Author: michaelnebel

csharp/extractor/Semmle.Extraction.CSharp/Entities/NamespaceDeclaration.cs

@@ -8,12 +8,12 @@
 
 namespace Semmle.Extraction.CSharp.Entities
 {
-    internal class NamespaceDeclaration : CachedEntity<NamespaceDeclarationSyntax>
+    internal class NamespaceDeclaration : CachedEntity<BaseNamespaceDeclarationSyntax>
     {
         private readonly NamespaceDeclaration parent;
-        private readonly NamespaceDeclarationSyntax node;
+        private readonly BaseNamespaceDeclarationSyntax node;
 
-        public NamespaceDeclaration(Context cx, NamespaceDeclarationSyntax node, NamespaceDeclaration parent)
+        public NamespaceDeclaration(Context cx, BaseNamespaceDeclarationSyntax node, NamespaceDeclaration parent)
             : base(cx, node)
         {
             this.node = node;
@@ -46,17 +46,17 @@ public override void Populate(TextWriter trapFile)
             }
         }
 
-        public static NamespaceDeclaration Create(Context cx, NamespaceDeclarationSyntax decl, NamespaceDeclaration parent)
+        public static NamespaceDeclaration Create(Context cx, BaseNamespaceDeclarationSyntax decl, NamespaceDeclaration parent)
         {
             var init = (decl, parent);
             return NamespaceDeclarationFactory.Instance.CreateEntity(cx, decl, init);
         }
 
-        private class NamespaceDeclarationFactory : CachedEntityFactory<(NamespaceDeclarationSyntax decl, NamespaceDeclaration parent), NamespaceDeclaration>
+        private class NamespaceDeclarationFactory : CachedEntityFactory<(BaseNamespaceDeclarationSyntax decl, NamespaceDeclaration parent), NamespaceDeclaration>
         {
             public static readonly NamespaceDeclarationFactory Instance = new NamespaceDeclarationFactory();
 
-            public override NamespaceDeclaration Create(Context cx, (NamespaceDeclarationSyntax decl, NamespaceDeclaration parent) init) =>
+            public override NamespaceDeclaration Create(Context cx, (BaseNamespaceDeclarationSyntax decl, NamespaceDeclaration parent) init) =>
                 new NamespaceDeclaration(cx, init.decl, init.parent);
         }
 

csharp/extractor/Semmle.Extraction.CSharp/Populators/TypeOrNamespaceVisitor.cs

@@ -16,9 +16,13 @@ public override void VisitUsingDirective(UsingDirectiveSyntax usingDirective)
                 new UsingDirective(Cx, usingDirective, (NamespaceDeclaration)Parent);
         }
 
-        public override void VisitNamespaceDeclaration(NamespaceDeclarationSyntax node)
-        {
+        private void CreateNamespaceDeclaration(BaseNamespaceDeclarationSyntax node) =>
             NamespaceDeclaration.Create(Cx, node, (NamespaceDeclaration)Parent);
-        }
+
+        public override void VisitNamespaceDeclaration(NamespaceDeclarationSyntax node) =>
+            CreateNamespaceDeclaration(node);
+
+        public override void VisitFileScopedNamespaceDeclaration(FileScopedNamespaceDeclarationSyntax node) =>
+            CreateNamespaceDeclaration(node);
     }
 }