Don't use C# keywords in the name of generated converters.

SvenGroot · Jul 14, 2023 · 2c3918b · 2c3918b
1 parent 29006dc
commit 2c3918b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Ookii.CommandLine.Generator/CommandGenerator.cs b/src/Ookii.CommandLine.Generator/CommandGenerator.cs
@@ -80,7 +80,7 @@ public void Generate()
             var source = GenerateManager(manager);
             if (source != null)
             {
-                _context.AddSource(manager.ToQualifiedName().ToIdentifier(".g.cs"), SourceText.From(source, Encoding.UTF8));
+                _context.AddSource(manager.ToDisplayString().ToIdentifier(".g.cs"), SourceText.From(source, Encoding.UTF8));
             }
         }
     }

diff --git a/src/Ookii.CommandLine.Generator/ConverterGenerator.cs b/src/Ookii.CommandLine.Generator/ConverterGenerator.cs
@@ -65,7 +65,7 @@ public ConverterGenerator(TypeHelper typeHelper, SourceProductionContext context
                 return null;
             }
 
-            info.Name = GenerateName(type.ToDisplayString());
+            info.Name = GenerateName(type);
             _converters.Add(type, info);
             converter = info;
         }
@@ -170,8 +170,15 @@ public ConverterGenerator(TypeHelper typeHelper, SourceProductionContext context
         return info;
     }
 
-    private static string GenerateName(string displayName)
+    private static string GenerateName(ITypeSymbol type)
     {
+        // Use the full framework name even for types that have keywords, and don't include global
+        // namespace.
+        var format = SymbolDisplayFormat.FullyQualifiedFormat
+            .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)
+            .RemoveMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
+
+        var displayName = type.ToDisplayString(format);
         return displayName.ToIdentifier(ConverterSuffix);
     }