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
113 changes: 110 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ csharp_prefer_braces = true:suggestion
#prefer block bodies for constructors
csharp_style_expression_bodied_constructors = false:suggestion
#prefer expression-bodied members for methods
csharp_style_expression_bodied_methods = true:suggestion
csharp_style_expression_bodied_methods = false:suggestion
#prefer expression-bodied members for properties
csharp_style_expression_bodied_properties = true:suggestion

Expand Down Expand Up @@ -96,10 +96,117 @@ csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
dotnet_style_qualification_for_field = false:suggestion
#prefer methods to be prefaced with this. in C# or Me. in Visual Basic
dotnet_style_qualification_for_method = true:suggestion
csharp_using_directive_placement=inside_namespace:suggestion
csharp_using_directive_placement= inside_namespace:suggestion

[*.{cs,vb}]
dotnet_style_qualification_for_field=true:silent
dotnet_style_qualification_for_property=true:silent
dotnet_style_qualification_for_method=true:silent
dotnet_style_qualification_for_event=true:silent
dotnet_style_qualification_for_event=true:silent
[*.cs]
#### Naming styles ####

# Naming rules

dotnet_naming_rule.const_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.const_should_be_pascal_case.symbols = const
dotnet_naming_rule.const_should_be_pascal_case.style = pascal_case

# Symbol specifications

dotnet_naming_symbols.const.applicable_kinds = field
dotnet_naming_symbols.const.applicable_accessibilities = *
dotnet_naming_symbols.const.required_modifiers = const

# Naming styles

dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case
csharp_indent_labels = one_less_than_current
csharp_prefer_simple_using_statement = true:suggestion
csharp_style_namespace_declarations = block_scoped:silent
csharp_style_prefer_method_group_conversion = true:silent
csharp_style_prefer_top_level_statements = true:silent
csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_accessors = true:silent
csharp_style_expression_bodied_lambdas = true:silent
csharp_style_expression_bodied_local_functions = false:silent
csharp_style_throw_expression = true:suggestion
csharp_style_prefer_null_check_over_type_check = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_prefer_local_over_anonymous_function = true:suggestion
csharp_style_prefer_index_operator = true:suggestion
csharp_style_prefer_range_operator = true:suggestion
csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
csharp_style_prefer_tuple_swap = true:suggestion
csharp_style_prefer_utf8_string_literals = true:suggestion

[*.{cs,vb}]
#### Naming styles ####

# Naming rules

dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i

dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case

dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case

# Symbol specifications

dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.interface.required_modifiers =

dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.types.required_modifiers =

dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.non_field_members.required_modifiers =

# Naming styles

dotnet_naming_style.begins_with_i.required_prefix = I
dotnet_naming_style.begins_with_i.required_suffix =
dotnet_naming_style.begins_with_i.word_separator =
dotnet_naming_style.begins_with_i.capitalization = pascal_case

dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case

dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case
dotnet_style_operator_placement_when_wrapping = beginning_of_line
tab_width = 4
indent_size = 4
end_of_line = crlf
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
dotnet_style_prefer_auto_properties = true:silent
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_compound_assignment = true:suggestion
dotnet_style_prefer_simplified_interpolation = true:suggestion
dotnet_style_namespace_match_folder = true:suggestion
14 changes: 14 additions & 0 deletions src/NaturalStringComparer/NaturalComparer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public static int Compare(ReadOnlySpan<char> x, ReadOnlySpan<char> y, StringComp
var xOut = GetNumber(x.Slice(i), out var xNum);
var yOut = GetNumber(y.Slice(i), out var yNum);

UnifyNumberTypes(ref xNum, ref yNum);
var compareResult = xNum.CompareTo(yNum);
if (compareResult != 0)
{
Expand Down Expand Up @@ -138,4 +139,17 @@ private static ReadOnlySpan<char> GetNumber(ReadOnlySpan<char> span, out ICompar

return span.Slice(i);
}

private static void UnifyNumberTypes(ref IComparable x, ref IComparable y)
{
if (x is ulong xLong && y is BigInteger)
{
x = new BigInteger(xLong);
}

if (x is BigInteger && y is ulong yLong)
{
y = new BigInteger(yLong);
}
}
}
4 changes: 3 additions & 1 deletion src/NaturalStringComparer/NaturalStringComparer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>

<Version>3.2.0</Version>
<Version>3.3.0</Version>
<RootNamespace>GihanSoft.String</RootNamespace>
<Authors>Muhammad Babayi</Authors>
<Company>GihanSoft</Company>
Expand All @@ -27,6 +27,8 @@
fix throw if larger than Int32, now support numbers up to infinity, or your ram capacity
3.2.0:
optimize
3.3.0:
fix bug of big and noramal number
</PackageReleaseNotes>
<PackageTags>string, comparer, IComparer, NaturalComparer, NaturalStringComparer, Natural-Sort, NaturalSort, String-Comparison, StringComparer, Sorting, Sort, Natural, csharp, c-sharp, C#, </PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down
12 changes: 12 additions & 0 deletions test/NaturalStringComparerTest/UnitTestUnsafe.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@ public void TestTooLargeNumber()
Assert.Equal(num1.CompareTo(num2), result);
}

[Fact]
public void TestShortAndTooLargeNumber()
{
var num1 = BigInteger.Parse("190156111906351901561119063519015611190635");
var num2 = 138;
var str1 = num1 + "G";
var str2 = num2 + "X";

var result = NaturalComparer.Compare(str1, str2, StringComparison.Ordinal);
Assert.Equal(num1.CompareTo(num2), result);
}

[Fact]
public void Test00()
{
Expand Down