Add support for File-scoped namespaces #117

Author: Samir L. Boulema

CodeNav.Shared/Mappers/NamespaceMapper.cs

@@ -52,6 +52,50 @@ public static CodeNamespaceItem MapNamespace(NamespaceDeclarationSyntax member,
             return item;
         }
 
+        #if VS2022
+        public static CodeNamespaceItem MapNamespace(BaseNamespaceDeclarationSyntax member,
+            ICodeViewUserControl control, SemanticModel semanticModel, SyntaxTree tree)
+        {
+            if (member == null) return null;
+
+            var item = BaseMapper.MapBase<CodeNamespaceItem>(member, member.Name, control, semanticModel);
+            item.Kind = CodeItemKindEnum.Namespace;
+            item.Moniker = IconMapper.MapMoniker(item.Kind, item.Access);
+            item.BorderColor = Colors.DarkGray;
+            item.IgnoreVisibility = VisibilityHelper.GetIgnoreVisibility(item);
+
+            if (TriviaSummaryMapper.HasSummary(member) && SettingsHelper.UseXMLComments)
+            {
+                item.Tooltip = TriviaSummaryMapper.Map(member);
+            }
+
+            var regions = RegionMapper.MapRegions(tree, member.Span, control);
+
+            foreach (var namespaceMember in member.Members)
+            {
+                var memberItem = SyntaxMapper.MapMember(namespaceMember);
+                if (memberItem != null && !RegionMapper.AddToRegion(regions, memberItem))
+                {
+                    item.Members.Add(memberItem);
+                }
+            }
+
+            // Add regions to namespace if they are not present in any children of the namespace
+            if (regions.Any())
+            {
+                foreach (var region in regions)
+                {
+                    if (FindHelper.FindCodeItem(item.Members, region.Id) == null)
+                    {
+                        item.Members.Add(region);
+                    }
+                }
+            }
+
+            return item;
+        }
+        #endif
+
         public static CodeNamespaceItem MapNamespace(VisualBasicSyntax.NamespaceBlockSyntax member, 
             ICodeViewUserControl control, SemanticModel semanticModel, SyntaxTree tree)
         {

CodeNav.Shared/Mappers/SyntaxMapper.cs

@@ -216,8 +216,14 @@ public static CodeItem MapMember(MemberDeclarationSyntax member)
                     return DelegateEventMapper.MapEvent(member as EventFieldDeclarationSyntax, _control, _semanticModel);
                 case SyntaxKind.DelegateDeclaration:
                     return DelegateEventMapper.MapDelegate(member as DelegateDeclarationSyntax, _control, _semanticModel);
+                #if VS2022
+                case SyntaxKind.FileScopedNamespaceDeclaration:
                 case SyntaxKind.NamespaceDeclaration:
-                    return NamespaceMapper.MapNamespace(member as NamespaceDeclarationSyntax, _control, _semanticModel, _tree);
+                    return NamespaceMapper.MapNamespace(member as BaseNamespaceDeclarationSyntax, _control, _semanticModel, _tree);
+                #else
+                case SyntaxKind.NamespaceDeclaration:
+                return NamespaceMapper.MapNamespace(member as NamespaceDeclarationSyntax, _control, _semanticModel, _tree);
+                #endif
                 case SyntaxKind.ConstructorDeclaration:
                     return MethodMapper.MapConstructor(member as ConstructorDeclarationSyntax, _control, _semanticModel);
                 case SyntaxKind.IndexerDeclaration:

CodeNav.VS2019/CodeNav.VS2019.csproj

@@ -62,7 +62,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;VS2019</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DeployExtension Condition=" '$(AppVeyor)' != '' Or '$(TF_BUILD)' != '' ">False</DeployExtension>
@@ -73,7 +73,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;VS2019</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DeployExtension Condition=" '$(AppVeyor)' != '' Or '$(TF_BUILD)' != '' ">False</DeployExtension>

CodeNav.VS2022/CodeNav.VS2022.csproj

@@ -62,7 +62,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;VS2022</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DeployExtension Condition=" '$(AppVeyor)' != '' Or '$(TF_BUILD)' != '' ">False</DeployExtension>
@@ -73,7 +73,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;VS2022</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DeployExtension Condition=" '$(AppVeyor)' != '' Or '$(TF_BUILD)' != '' ">False</DeployExtension>

azure-pipelines.yml

@@ -7,7 +7,7 @@ trigger:
     - main
     - feature/*
 
-name: 8.2.$(Build.BuildId)
+name: 8.3.$(Build.BuildId)
 
 steps:
 - task: NuGetCommand@2