fix: namespaces

Author: ronimizy

samples/generators/SourceKit.Generators.Grpc.Samples/protos/duplicate_root_namespace.proto

@@ -3,4 +3,9 @@ option csharp_namespace = "SourceKit.Sample.SourceKit.Models";
 
 message DuplicateRootNamespace {
   int32 value = 1;
+  DuplicateRootNamespace2 two = 2;
+}
+
+message DuplicateRootNamespace2 {
+  int32 value = 1;
 }

src/SourceKit/Extensions/NamedTypeSymbolExtensions.cs

@@ -8,15 +8,17 @@ namespace SourceKit.Extensions;
 
 public static class NamedTypeSymbolExtensions
 {
-    private static SymbolDisplayFormat ConfigureDisplayFormat(SymbolDisplayFormat format) => format
-        .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)
+    private static SymbolDisplayFormat ConfigureDisplayFormat(SymbolDisplayFormat format, bool includeGlobal) => format
+        .WithGlobalNamespaceStyle(includeGlobal
+            ? SymbolDisplayGlobalNamespaceStyle.Included
+            : SymbolDisplayGlobalNamespaceStyle.Omitted)
         .WithGenericsOptions(SymbolDisplayGenericsOptions.None);
 
-    private static readonly SymbolDisplayFormat FullyQualifiedSymbolFormat =
-        ConfigureDisplayFormat(SymbolDisplayFormat.FullyQualifiedFormat);
+    private static SymbolDisplayFormat FullyQualifiedSymbolFormat(bool includeGlobal)
+        => ConfigureDisplayFormat(SymbolDisplayFormat.FullyQualifiedFormat, includeGlobal);
 
-    private static readonly SymbolDisplayFormat ShortSymbolFormat =
-        ConfigureDisplayFormat(SymbolDisplayFormat.MinimallyQualifiedFormat);
+    private static SymbolDisplayFormat ShortSymbolFormat(bool includeGlobal)
+        => ConfigureDisplayFormat(SymbolDisplayFormat.MinimallyQualifiedFormat, includeGlobal);
 
     private static bool TryGetTypeArgumentSyntax(
         this INamespaceOrTypeSymbol symbol,
@@ -39,15 +41,18 @@ private static bool TryGetTypeArgumentSyntax(
         return false;
     }
 
-    public static string GetFullyQualifiedName(this INamespaceOrTypeSymbol symbol)
-        => symbol.ToDisplayString(FullyQualifiedSymbolFormat);
+    public static string GetFullyQualifiedName(this INamespaceOrTypeSymbol symbol, bool includeGlobal = false)
+        => symbol.ToDisplayString(FullyQualifiedSymbolFormat(includeGlobal));
 
-    public static string GetShortName(this INamespaceOrTypeSymbol symbol)
-        => symbol.ToDisplayString(ShortSymbolFormat);
+    public static string GetShortName(this INamespaceOrTypeSymbol symbol, bool includeGlobal = false)
+        => symbol.ToDisplayString(ShortSymbolFormat(includeGlobal));
 
-    public static TypeSyntax ToNameSyntax(this INamespaceOrTypeSymbol symbol, bool fullyQualified = true)
+    public static TypeSyntax ToNameSyntax(
+        this INamespaceOrTypeSymbol symbol,
+        bool fullyQualified = true,
+        bool includeGlobal = false)
     {
-        string name = fullyQualified ? symbol.GetFullyQualifiedName() : symbol.GetShortName();
+        string name = fullyQualified ? symbol.GetFullyQualifiedName(includeGlobal) : symbol.GetShortName(includeGlobal);
 
         TypeSyntax type = TryGetTypeArgumentSyntax(symbol, fullyQualified, out TypeArgumentListSyntax? typeArguments)
             ? GenericName(Identifier(name), typeArguments)
@@ -77,7 +82,7 @@ public static TypeSyntax ToNameSyntax(this INamespaceOrTypeSymbol symbol, bool f
     public static IEnumerable<INamedTypeSymbol> GetBaseTypes(this INamedTypeSymbol symbol)
     {
         return symbol.BaseType is null
-            ? Enumerable.Empty<INamedTypeSymbol>()
+            ? []
             : Enumerable.Repeat(symbol.BaseType, 1).Concat(symbol.BaseType.GetBaseTypes());
     }
 
@@ -139,4 +144,4 @@ public static TypeDeclarationSyntax ToSyntax(this INamedTypeSymbol symbol)
             _ => throw new ArgumentOutOfRangeException(),
         };
     }
-}
+}

src/SourceKit/Extensions/TypeSymbolExtensions.cs

@@ -6,11 +6,15 @@ namespace SourceKit.Extensions;
 
 public static class TypeSymbolExtensions
 {
-    public static IEnumerable<IdentifierNameSyntax> ToTypeArgumentSyntax(this IEnumerable<ITypeSymbol> symbols)
-        => symbols.Select(ToTypeArgumentSyntax);
+    public static IEnumerable<IdentifierNameSyntax> ToTypeArgumentSyntax(
+        this IEnumerable<ITypeSymbol> symbols,
+        bool includeGlobal = false)
+    {
+        return symbols.Select(x => x.ToTypeArgumentSyntax(includeGlobal));
+    }
 
-    public static IdentifierNameSyntax ToTypeArgumentSyntax(this ITypeSymbol symbol)
-        => IdentifierName(symbol.GetFullyQualifiedName());
+    public static IdentifierNameSyntax ToTypeArgumentSyntax(this ITypeSymbol symbol, bool includeGlobal = false)
+        => IdentifierName(symbol.GetFullyQualifiedName(includeGlobal));
 
     public static bool IsAssignableTo(this ITypeSymbol source, ITypeSymbol destination)
     {
@@ -81,4 +85,4 @@ public static ITypeSymbol GetEnumerableTypeArgument(this ITypeSymbol enumerableT
 
         return constructedFrom.TypeArguments.Single();
     }
-}
+}

src/generators/SourceKit.Generators.Grpc/Builders/TypeBuilders/ConstructorTypeBuilder.cs

@@ -50,16 +50,16 @@ private static IEnumerable<ParameterSyntax> MapParameters(TypeBuildingCommand co
             if (property is RepeatableProtoProperty repeatableProperty)
             {
                 var typeArguments = TypeArgumentList(
-                    SingletonSeparatedList(repeatableProperty.ElementType.ToNameSyntax(fullyQualified: true)));
+                    SingletonSeparatedList(repeatableProperty.ElementType.ToNameSyntax(includeGlobal: true)));
 
                 typeName = GenericName(Identifier("IEnumerable"), typeArguments);
             }
             else if (property is MapProtoProperty mapProperty)
             {
                 var typeArguments = TypeArgumentList(SeparatedList(new[]
                 {
-                    mapProperty.Key.ToNameSyntax(fullyQualified: true),
-                    mapProperty.Value.ToNameSyntax(fullyQualified: true),
+                    mapProperty.Key.ToNameSyntax(includeGlobal: true),
+                    mapProperty.Value.ToNameSyntax(includeGlobal: true),
                 }));
 
                 var keyValuePair = GenericName(Identifier("KeyValuePair"), typeArguments);
@@ -70,7 +70,7 @@ private static IEnumerable<ParameterSyntax> MapParameters(TypeBuildingCommand co
             }
             else if (property is ValueProtoProperty valueProperty)
             {
-                typeName = valueProperty.Type.ToNameSyntax(fullyQualified: true);
+                typeName = valueProperty.Type.ToNameSyntax(includeGlobal: true);
             }
             else
             {
@@ -132,8 +132,8 @@ private static StatementSyntax CreateMapAssignment(
 
         var typeArguments = TypeArgumentList(SeparatedList<TypeSyntax>(new[]
         {
-            mapProperty.Key.ToTypeArgumentSyntax(),
-            mapProperty.Value.ToTypeArgumentSyntax(),
+            mapProperty.Key.ToTypeArgumentSyntax(includeGlobal: true),
+            mapProperty.Value.ToTypeArgumentSyntax(includeGlobal: true),
         }));
 
         var keyValuePair = GenericName(Identifier("KeyValuePair"), typeArguments);
@@ -191,4 +191,4 @@ private static StatementSyntax CreateOneOfAssignment(
 
         return IfStatement(condition, Block(statement));
     }
-}
+}