mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-26 20:09:19 +00:00
Suspicious line endings
This commit is contained in:
kjeremy
parent
0492b18ed4
commit
6da645d858
1 changed files with 370 additions and 370 deletions
|
|
@ -1,370 +1,370 @@
|
||||||
use hir::db::HirDatabase;
|
use hir::db::HirDatabase;
|
||||||
use ra_syntax::{ast::AstNode, ast::Literal, TextRange, TextUnit};
|
use ra_syntax::{ast::AstNode, ast::Literal, TextRange, TextUnit};
|
||||||
|
|
||||||
use crate::{Assist, AssistCtx, AssistId};
|
use crate::{Assist, AssistCtx, AssistId};
|
||||||
|
|
||||||
pub(crate) fn make_raw_string(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
|
pub(crate) fn make_raw_string(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
|
||||||
let literal = ctx.node_at_offset::<Literal>()?;
|
let literal = ctx.node_at_offset::<Literal>()?;
|
||||||
if literal.token().kind() != ra_syntax::SyntaxKind::STRING {
|
if literal.token().kind() != ra_syntax::SyntaxKind::STRING {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
ctx.add_action(AssistId("make_raw_string"), "make raw string", |edit| {
|
ctx.add_action(AssistId("make_raw_string"), "make raw string", |edit| {
|
||||||
edit.target(literal.syntax().text_range());
|
edit.target(literal.syntax().text_range());
|
||||||
edit.insert(literal.syntax().text_range().start(), "r");
|
edit.insert(literal.syntax().text_range().start(), "r");
|
||||||
});
|
});
|
||||||
ctx.build()
|
ctx.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn find_usual_string_range(s: &str) -> Option<TextRange> {
|
fn find_usual_string_range(s: &str) -> Option<TextRange> {
|
||||||
Some(TextRange::from_to(
|
Some(TextRange::from_to(
|
||||||
TextUnit::from(s.find('"')? as u32),
|
TextUnit::from(s.find('"')? as u32),
|
||||||
TextUnit::from(s.rfind('"')? as u32),
|
TextUnit::from(s.rfind('"')? as u32),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn make_usual_string(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
|
pub(crate) fn make_usual_string(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
|
||||||
let literal = ctx.node_at_offset::<Literal>()?;
|
let literal = ctx.node_at_offset::<Literal>()?;
|
||||||
if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {
|
if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let token = literal.token();
|
let token = literal.token();
|
||||||
let text = token.text().as_str();
|
let text = token.text().as_str();
|
||||||
let usual_string_range = find_usual_string_range(text)?;
|
let usual_string_range = find_usual_string_range(text)?;
|
||||||
ctx.add_action(AssistId("make_usual_string"), "make usual string", |edit| {
|
ctx.add_action(AssistId("make_usual_string"), "make usual string", |edit| {
|
||||||
edit.target(literal.syntax().text_range());
|
edit.target(literal.syntax().text_range());
|
||||||
// parse inside string to escape `"`
|
// parse inside string to escape `"`
|
||||||
let start_of_inside = usual_string_range.start().to_usize() + 1;
|
let start_of_inside = usual_string_range.start().to_usize() + 1;
|
||||||
let end_of_inside = usual_string_range.end().to_usize();
|
let end_of_inside = usual_string_range.end().to_usize();
|
||||||
let inside_str = &text[start_of_inside..end_of_inside];
|
let inside_str = &text[start_of_inside..end_of_inside];
|
||||||
let escaped = inside_str.escape_default().to_string();
|
let escaped = inside_str.escape_default().to_string();
|
||||||
edit.replace(literal.syntax().text_range(), format!("\"{}\"", escaped));
|
edit.replace(literal.syntax().text_range(), format!("\"{}\"", escaped));
|
||||||
});
|
});
|
||||||
ctx.build()
|
ctx.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn add_hash(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
|
pub(crate) fn add_hash(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
|
||||||
let literal = ctx.node_at_offset::<Literal>()?;
|
let literal = ctx.node_at_offset::<Literal>()?;
|
||||||
if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {
|
if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
ctx.add_action(AssistId("add_hash"), "add hash to raw string", |edit| {
|
ctx.add_action(AssistId("add_hash"), "add hash to raw string", |edit| {
|
||||||
edit.target(literal.syntax().text_range());
|
edit.target(literal.syntax().text_range());
|
||||||
edit.insert(literal.syntax().text_range().start() + TextUnit::of_char('r'), "#");
|
edit.insert(literal.syntax().text_range().start() + TextUnit::of_char('r'), "#");
|
||||||
edit.insert(literal.syntax().text_range().end(), "#");
|
edit.insert(literal.syntax().text_range().end(), "#");
|
||||||
});
|
});
|
||||||
ctx.build()
|
ctx.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn remove_hash(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
|
pub(crate) fn remove_hash(mut ctx: AssistCtx<impl HirDatabase>) -> Option<Assist> {
|
||||||
let literal = ctx.node_at_offset::<Literal>()?;
|
let literal = ctx.node_at_offset::<Literal>()?;
|
||||||
if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {
|
if literal.token().kind() != ra_syntax::SyntaxKind::RAW_STRING {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let token = literal.token();
|
let token = literal.token();
|
||||||
let text = token.text().as_str();
|
let text = token.text().as_str();
|
||||||
if text.starts_with("r\"") {
|
if text.starts_with("r\"") {
|
||||||
// no hash to remove
|
// no hash to remove
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
ctx.add_action(AssistId("remove_hash"), "remove hash from raw string", |edit| {
|
ctx.add_action(AssistId("remove_hash"), "remove hash from raw string", |edit| {
|
||||||
edit.target(literal.syntax().text_range());
|
edit.target(literal.syntax().text_range());
|
||||||
let result = &text[2..text.len() - 1];
|
let result = &text[2..text.len() - 1];
|
||||||
let result = if result.starts_with("\"") {
|
let result = if result.starts_with("\"") {
|
||||||
// no more hash, escape
|
// no more hash, escape
|
||||||
let internal_str = &result[1..result.len() - 1];
|
let internal_str = &result[1..result.len() - 1];
|
||||||
format!("\"{}\"", internal_str.escape_default().to_string())
|
format!("\"{}\"", internal_str.escape_default().to_string())
|
||||||
} else {
|
} else {
|
||||||
result.to_owned()
|
result.to_owned()
|
||||||
};
|
};
|
||||||
edit.replace(literal.syntax().text_range(), format!("r{}", result));
|
edit.replace(literal.syntax().text_range(), format!("r{}", result));
|
||||||
});
|
});
|
||||||
ctx.build()
|
ctx.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use super::*;
|
use super::*;
|
||||||
use crate::helpers::{check_assist, check_assist_not_applicable, check_assist_target};
|
use crate::helpers::{check_assist, check_assist_not_applicable, check_assist_target};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn make_raw_string_target() {
|
fn make_raw_string_target() {
|
||||||
check_assist_target(
|
check_assist_target(
|
||||||
make_raw_string,
|
make_raw_string,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>"random string";
|
let s = <|>"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
r#""random string""#,
|
r#""random string""#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn make_raw_string_works() {
|
fn make_raw_string_works() {
|
||||||
check_assist(
|
check_assist(
|
||||||
make_raw_string,
|
make_raw_string,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>"random string";
|
let s = <|>"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r"random string";
|
let s = <|>r"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn make_raw_string_with_escaped_works() {
|
fn make_raw_string_with_escaped_works() {
|
||||||
check_assist(
|
check_assist(
|
||||||
make_raw_string,
|
make_raw_string,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>"random\nstring";
|
let s = <|>"random\nstring";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r"random\nstring";
|
let s = <|>r"random\nstring";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn make_raw_string_not_works() {
|
fn make_raw_string_not_works() {
|
||||||
check_assist_not_applicable(
|
check_assist_not_applicable(
|
||||||
make_raw_string,
|
make_raw_string,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r"random string";
|
let s = <|>r"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn add_hash_target() {
|
fn add_hash_target() {
|
||||||
check_assist_target(
|
check_assist_target(
|
||||||
add_hash,
|
add_hash,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r"random string";
|
let s = <|>r"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
r#"r"random string""#,
|
r#"r"random string""#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn add_hash_works() {
|
fn add_hash_works() {
|
||||||
check_assist(
|
check_assist(
|
||||||
add_hash,
|
add_hash,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r"random string";
|
let s = <|>r"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
r##"
|
r##"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r#"random string"#;
|
let s = <|>r#"random string"#;
|
||||||
}
|
}
|
||||||
"##,
|
"##,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn add_more_hash_works() {
|
fn add_more_hash_works() {
|
||||||
check_assist(
|
check_assist(
|
||||||
add_hash,
|
add_hash,
|
||||||
r##"
|
r##"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r#"random"string"#;
|
let s = <|>r#"random"string"#;
|
||||||
}
|
}
|
||||||
"##,
|
"##,
|
||||||
r###"
|
r###"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r##"random"string"##;
|
let s = <|>r##"random"string"##;
|
||||||
}
|
}
|
||||||
"###,
|
"###,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn add_hash_not_works() {
|
fn add_hash_not_works() {
|
||||||
check_assist_not_applicable(
|
check_assist_not_applicable(
|
||||||
add_hash,
|
add_hash,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>"random string";
|
let s = <|>"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn remove_hash_target() {
|
fn remove_hash_target() {
|
||||||
check_assist_target(
|
check_assist_target(
|
||||||
remove_hash,
|
remove_hash,
|
||||||
r##"
|
r##"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r#"random string"#;
|
let s = <|>r#"random string"#;
|
||||||
}
|
}
|
||||||
"##,
|
"##,
|
||||||
r##"r#"random string"#"##,
|
r##"r#"random string"#"##,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn remove_hash_works() {
|
fn remove_hash_works() {
|
||||||
check_assist(
|
check_assist(
|
||||||
remove_hash,
|
remove_hash,
|
||||||
r##"
|
r##"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r#"random string"#;
|
let s = <|>r#"random string"#;
|
||||||
}
|
}
|
||||||
"##,
|
"##,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r"random string";
|
let s = <|>r"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn remove_hash_with_quote_works() {
|
fn remove_hash_with_quote_works() {
|
||||||
check_assist(
|
check_assist(
|
||||||
remove_hash,
|
remove_hash,
|
||||||
r##"
|
r##"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r#"random"str"ing"#;
|
let s = <|>r#"random"str"ing"#;
|
||||||
}
|
}
|
||||||
"##,
|
"##,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r"random\"str\"ing";
|
let s = <|>r"random\"str\"ing";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn remove_more_hash_works() {
|
fn remove_more_hash_works() {
|
||||||
check_assist(
|
check_assist(
|
||||||
remove_hash,
|
remove_hash,
|
||||||
r###"
|
r###"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r##"random string"##;
|
let s = <|>r##"random string"##;
|
||||||
}
|
}
|
||||||
"###,
|
"###,
|
||||||
r##"
|
r##"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r#"random string"#;
|
let s = <|>r#"random string"#;
|
||||||
}
|
}
|
||||||
"##,
|
"##,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn remove_hash_not_works() {
|
fn remove_hash_not_works() {
|
||||||
check_assist_not_applicable(
|
check_assist_not_applicable(
|
||||||
remove_hash,
|
remove_hash,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>"random string";
|
let s = <|>"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn remove_hash_no_hash_not_works() {
|
fn remove_hash_no_hash_not_works() {
|
||||||
check_assist_not_applicable(
|
check_assist_not_applicable(
|
||||||
remove_hash,
|
remove_hash,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r"random string";
|
let s = <|>r"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn make_usual_string_target() {
|
fn make_usual_string_target() {
|
||||||
check_assist_target(
|
check_assist_target(
|
||||||
make_usual_string,
|
make_usual_string,
|
||||||
r##"
|
r##"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r#"random string"#;
|
let s = <|>r#"random string"#;
|
||||||
}
|
}
|
||||||
"##,
|
"##,
|
||||||
r##"r#"random string"#"##,
|
r##"r#"random string"#"##,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn make_usual_string_works() {
|
fn make_usual_string_works() {
|
||||||
check_assist(
|
check_assist(
|
||||||
make_usual_string,
|
make_usual_string,
|
||||||
r##"
|
r##"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r#"random string"#;
|
let s = <|>r#"random string"#;
|
||||||
}
|
}
|
||||||
"##,
|
"##,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>"random string";
|
let s = <|>"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn make_usual_string_with_quote_works() {
|
fn make_usual_string_with_quote_works() {
|
||||||
check_assist(
|
check_assist(
|
||||||
make_usual_string,
|
make_usual_string,
|
||||||
r##"
|
r##"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r#"random"str"ing"#;
|
let s = <|>r#"random"str"ing"#;
|
||||||
}
|
}
|
||||||
"##,
|
"##,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>"random\"str\"ing";
|
let s = <|>"random\"str\"ing";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn make_usual_string_more_hash_works() {
|
fn make_usual_string_more_hash_works() {
|
||||||
check_assist(
|
check_assist(
|
||||||
make_usual_string,
|
make_usual_string,
|
||||||
r###"
|
r###"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>r##"random string"##;
|
let s = <|>r##"random string"##;
|
||||||
}
|
}
|
||||||
"###,
|
"###,
|
||||||
r##"
|
r##"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>"random string";
|
let s = <|>"random string";
|
||||||
}
|
}
|
||||||
"##,
|
"##,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn make_usual_string_not_works() {
|
fn make_usual_string_not_works() {
|
||||||
check_assist_not_applicable(
|
check_assist_not_applicable(
|
||||||
make_usual_string,
|
make_usual_string,
|
||||||
r#"
|
r#"
|
||||||
fn f() {
|
fn f() {
|
||||||
let s = <|>"random string";
|
let s = <|>"random string";
|
||||||
}
|
}
|
||||||
"#,
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue