Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -389,25 +389,27 @@ public string GetCleanNameSpace(string clientNamespace)
while (nextDot != -1)
{
var segment = source.Slice(0, nextDot);
if (IsSpecialSegment(segment))
var segmentStr = segment.ToString();
var cleanedSegment = segmentStr.ToIdentifierName();
if (IsSpecialSegment(cleanedSegment))
{
dest[destIndex] = '_';
destIndex++;
cleanedSegment = "_" + cleanedSegment;
}
segment.CopyTo(dest.Slice(destIndex));
destIndex += segment.Length;
cleanedSegment.AsSpan().CopyTo(dest.Slice(destIndex));
destIndex += cleanedSegment.Length;
dest[destIndex] = '.';
destIndex++;
source = source.Slice(nextDot + 1);
nextDot = source.IndexOf('.');
}
if (IsSpecialSegment(source))
var lastSegmentStr = source.ToString();
var cleanedLastSegment = lastSegmentStr.ToIdentifierName();
if (IsSpecialSegment(cleanedLastSegment))
{
dest[destIndex] = '_';
destIndex++;
cleanedLastSegment = "_" + cleanedLastSegment;
}
source.CopyTo(dest.Slice(destIndex));
destIndex += source.Length;
cleanedLastSegment.AsSpan().CopyTo(dest.Slice(destIndex));
destIndex += cleanedLastSegment.Length;
return dest.Slice(0, destIndex).ToString();
}

Expand All @@ -424,6 +426,8 @@ private bool IsSpecialSegment(ReadOnlySpan<char> readOnlySpan)
return false;
}

private bool IsSpecialSegment(string segment) => IsSpecialSegment(segment.AsSpan());

private static int GetSegmentCount(string clientNamespace)
{
int count = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,5 +162,34 @@ public void CreatesFrameworkType(Type expectedType)
var actual = factory.InvokeCreateFrameworkType(expectedType.FullName!);
Assert.AreEqual(expectedType, actual);
}

[TestCase("lowercase", "Lowercase")]
[TestCase("lowercase.namespace", "Lowercase.Namespace")]
[TestCase("lowercase.namespace.client", "Lowercase.Namespace.Client")]
[TestCase("PascalCase", "PascalCase")]
[TestCase("PascalCase.Namespace", "PascalCase.Namespace")]
[TestCase("camelCase", "CamelCase")]
[TestCase("camelCase.namespace", "CamelCase.Namespace")]
[TestCase("kebab-case", "KebabCase")]
[TestCase("kebab-case.namespace", "KebabCase.Namespace")]
[TestCase("snake_case", "SnakeCase")]
[TestCase("snake_case.namespace", "SnakeCase.Namespace")]
[TestCase("mixed_case-namespace.example", "MixedCaseNamespace.Example")]
[TestCase("number123", "Number123")]
[TestCase("number123.namespace", "Number123.Namespace")]
[TestCase("UPPERCASE", "UPPERCASE")]
[TestCase("UPPERCASE.NAMESPACE", "UPPERCASE.NAMESPACE")]
[TestCase("type.union", "_Type.Union")]
[TestCase("type.array", "_Type._Array")]
[TestCase("array.foo", "_Array.Foo")]
[TestCase("enum.bar", "_Enum.Bar")]
[TestCase("Type.Union", "_Type.Union")]
[TestCase("Array.Foo", "_Array.Foo")]
[TestCase("Enum.Bar", "_Enum.Bar")]
public void GetCleanNameSpace_ConvertsToPascalCase(string input, string expected)
{
var actual = CodeModelGenerator.Instance.TypeFactory.GetCleanNameSpace(input);
Assert.AreEqual(expected, actual);
}
}
}
Loading