Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve string helpers functions

Browse source
This commit is contained in:
Igor Aleksanov 2020-10-03 16:45:16 +03:00
parent 21dd704b6b
commit 17f1026c46
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/hir_ty/src/diagnostics/decl_check/str_helpers.rs
View file

@ -61,7 +61,9 @@ fn is_upper_snake_case(ident: &str) -> bool {
fn is_camel_case(ident: &str) -> bool { fn is_camel_case(ident: &str) -> bool {
// We assume that the string is either snake case or camel case. // We assume that the string is either snake case or camel case.
ident.chars().all(|c| c != '_') // `_` is allowed only at the beginning or in the end of identifier, not between characters.
ident.trim_matches('_').chars().all(|c| c != '_')
&& ident.chars().find(|c| c.is_alphabetic()).map(|c| c.is_ascii_uppercase()).unwrap_or(true)
} }
#[cfg(test)] #[cfg(test)]
@ -80,13 +82,18 @@ mod tests {
fn test_to_lower_snake_case() { fn test_to_lower_snake_case() {
check(to_lower_snake_case, "lower_snake_case", expect![[""]]); check(to_lower_snake_case, "lower_snake_case", expect![[""]]);
check(to_lower_snake_case, "UPPER_SNAKE_CASE", expect![["upper_snake_case"]]); check(to_lower_snake_case, "UPPER_SNAKE_CASE", expect![["upper_snake_case"]]);
check(to_lower_snake_case, "Weird_Case", expect![["weird_case"]]);
check(to_lower_snake_case, "CamelCase", expect![["camel_case"]]); check(to_lower_snake_case, "CamelCase", expect![["camel_case"]]);
} }
#[test] #[test]
fn test_to_camel_case() { fn test_to_camel_case() {
check(to_camel_case, "CamelCase", expect![[""]]); check(to_camel_case, "CamelCase", expect![[""]]);
check(to_camel_case, "CamelCase_", expect![[""]]);
check(to_camel_case, "_CamelCase", expect![[""]]);
check(to_camel_case, "lower_snake_case", expect![["LowerSnakeCase"]]); check(to_camel_case, "lower_snake_case", expect![["LowerSnakeCase"]]);
check(to_camel_case, "UPPER_SNAKE_CASE", expect![["UpperSnakeCase"]]); check(to_camel_case, "UPPER_SNAKE_CASE", expect![["UpperSnakeCase"]]);
check(to_camel_case, "Weird_Case", expect![["WeirdCase"]]);
check(to_camel_case, "name", expect![["Name"]]);
} }
} }

4
crates/stdx/src/lib.rs
View file

@ -32,9 +32,13 @@ pub fn to_lower_snake_case(s: &str) -> String {
let mut buf = String::with_capacity(s.len()); let mut buf = String::with_capacity(s.len());
let mut prev = false; let mut prev = false;
for c in s.chars() { for c in s.chars() {
// `&& prev` is required to not insert `_` before the first symbol.
if c.is_ascii_uppercase() && prev { if c.is_ascii_uppercase() && prev {
// This check is required to not translate `Weird_Case` into `weird__case`.
if buf.chars().last() != Some('_') {
buf.push('_') buf.push('_')
} }
}
prev = true; prev = true;
buf.push(c.to_ascii_lowercase()); buf.push(c.to_ascii_lowercase());