mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-26 00:34:06 +00:00
Cleanup
This commit is contained in:
parent
dd0c3c41b9
commit
d06733efeb
@ -38,7 +38,7 @@ pub struct GroupLabel(pub String);
|
||||
impl AssistLabel {
|
||||
pub(crate) fn new(label: String, id: AssistId) -> AssistLabel {
|
||||
// FIXME: make fields private, so that this invariant can't be broken
|
||||
assert!(label.chars().next().unwrap().is_uppercase());
|
||||
assert!(label.starts_with(|c: char| c.is_uppercase()));
|
||||
AssistLabel { label, id }
|
||||
}
|
||||
}
|
||||
|
@ -135,11 +135,7 @@ impl Completions {
|
||||
let (before, after) = (&docs[..idx], &docs[idx + s.len()..]);
|
||||
// Ensure to match the full word
|
||||
if after.starts_with('!')
|
||||
&& before
|
||||
.chars()
|
||||
.rev()
|
||||
.next()
|
||||
.map_or(true, |c| c != '_' && !c.is_ascii_alphanumeric())
|
||||
&& !before.ends_with(|c: char| c == '_' || c.is_ascii_alphanumeric())
|
||||
{
|
||||
// It may have spaces before the braces like `foo! {}`
|
||||
match after[1..].chars().find(|&c| !c.is_whitespace()) {
|
||||
|
@ -141,7 +141,7 @@ fn convert_literal(l: &tt::Literal) -> TtToken {
|
||||
}
|
||||
|
||||
fn convert_ident(ident: &tt::Ident) -> TtToken {
|
||||
let kind = if let Some('\'') = ident.text.chars().next() {
|
||||
let kind = if ident.text.starts_with('\'') {
|
||||
LIFETIME
|
||||
} else {
|
||||
SyntaxKind::from_keyword(ident.text.as_str()).unwrap_or(IDENT)
|
||||
|
Loading…
Reference in New Issue
Block a user