Skip to content

Adjust ToCamelCase Extension #8274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Adjust ToCamelCase Extension #8274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 19 additions & 4 deletions src/Elastic.Clients.Elasticsearch.Shared/Core/Extensions/StringExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,25 @@ internal static string ToCamelCase(this string s)
if (!char.IsUpper(s[0]))
return s;

var camelCase = char.ToLowerInvariant(s[0]).ToString();
if (s.Length > 1)
camelCase += s.Substring(1);
var chars = s.ToCharArray();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var chars = s.ToCharArray();
#if NET6_0_OR_GREATER
Span<char> chars = stackalloc char[s.Length];
s.CopyTo(chars);
#else
var chars = s.ToCharArray();
#endif

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This requires an additional:

#if NET6_0_OR_GREATER
using System;
#endif


return camelCase;
for (var i = 0; i < chars.Length; i++)
{
var current = chars[i];

if (char.IsSeparator(current))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (char.IsSeparator(current))
if (!char.IsLetter(current))

break;

if (0 < i && i + 1 < chars.Length)
{
var next = chars[i + 1];
if (!char.IsUpper(next) && !char.IsSeparator(next))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (!char.IsUpper(next) && !char.IsSeparator(next))
if (char.IsLetter(next) && !char.IsUpper(next))

break;
}

chars[i] = char.ToLowerInvariant(current);
}

return new string(chars);
}
}
19 changes: 19 additions & 0 deletions tests/Tests/Core/Extensions/StringExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Licensed to Elasticsearch B.V under one or more agreements.
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
// See the LICENSE file in the project root for more information.

namespace Tests.Core.Extensions;

public class StringExtensionsTests
{
[U]
public void ToCamelCase()
{
"camelCase".ToCamelCase().Should().Be("camelCase");
"CamelCase".ToCamelCase().Should().Be("camelCase");
"CAMELCase".ToCamelCase().Should().Be("camelCase");
"CamelCASE".ToCamelCase().Should().Be("camelCASE");
"Camel Case".ToCamelCase().Should().Be("camel Case");
"camel Case".ToCamelCase().Should().Be("camel Case");
}
}