Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions YamlDotNet.Analyzers.StaticGenerator/TypeFactoryGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,14 @@ private string GenerateSource(SerializableSyntaxReceiver syntaxReceiver)
write("using System;", true);
write("using System.Collections.Generic;", true);

var namespaceName = syntaxReceiver.YamlStaticContextType?.ContainingNamespace.ContainingNamespace;
var namespaceName = syntaxReceiver.YamlStaticContextType?.GetNamespace();
var isGlobalNamespace = string.IsNullOrEmpty(namespaceName);

write($"namespace {syntaxReceiver.YamlStaticContextType?.GetNamespace() ?? "YamlDotNet.Static"}", true);
write("{", true); indent();
if (!isGlobalNamespace)
{
write($"namespace {namespaceName}", true);
write("{", true); indent();
}

new StaticContextFile(write, indent, unindent, _context).Write(syntaxReceiver);
new StaticObjectFactoryFile(write, indent, unindent, _context).Write(syntaxReceiver);
Expand All @@ -101,7 +105,10 @@ private string GenerateSource(SerializableSyntaxReceiver syntaxReceiver)
new StaticTypeInspectorFile(write, indent, unindent, _context).Write(syntaxReceiver);
new ObjectAccessorFileGenerator(write, indent, unindent, _context).Write(syntaxReceiver);

unindent(); write("}", true);
if (!isGlobalNamespace)
{
unindent(); write("}", true);
}
}
catch (Exception exception)
{
Expand Down