Skip to content

Fix String case functions inconsistency #15630

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
AlexGx wants to merge 1 commit into from
Closed

Fix String case functions inconsistency #15630

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
13 changes: 5 additions & 8 deletions lib/elixir/lib/string.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ defmodule String do

@type replace_opts :: [global: boolean()]

@case_modes [:default, :ascii, :greek, :turkic]
@conditional_mappings [:greek, :turkic]

@doc """
Expand Down Expand Up @@ -926,9 +927,7 @@ defmodule String do
@spec upcase(t, :default | :ascii | :greek | :turkic) :: t
def upcase(string, mode \\ :default)

def upcase("", _mode) do
""
end
def upcase("", mode) when mode in @case_modes, do: ""

def upcase(string, :default) when is_binary(string) do
String.Unicode.upcase(string, [], :default)
Expand Down Expand Up @@ -996,9 +995,7 @@ defmodule String do
@spec downcase(t, :default | :ascii | :greek | :turkic) :: t
def downcase(string, mode \\ :default)

def downcase("", _mode) do
""
end
def downcase("", mode) when mode in @case_modes, do: ""

def downcase(string, :default) when is_binary(string) do
String.Unicode.downcase(string, [], :default)
Expand Down Expand Up @@ -1057,11 +1054,11 @@ defmodule String do
@letter_i <<0x0069::utf8>>
@letter_I_dot_above <<0x0130::utf8>>

def capitalize(<<@letter_i, right::binary>>, mode) do
def capitalize(<<@letter_i, right::binary>>, mode) when mode in @case_modes do
if(mode == :turkic, do: @letter_I_dot_above, else: @letter_I) <> downcase(right, mode)
end

def capitalize(string, mode) when is_binary(string) do
def capitalize(string, mode) when is_binary(string) and mode in @case_modes do
case :unicode_util.gc(string) do
[gc] -> grapheme_to_binary(:string.titlecase([gc]))
[gc, rest] -> grapheme_to_binary(:string.titlecase([gc])) <> downcase(rest, mode)
Expand Down