language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Change <|> to $0 - Rebase

Browse source
This commit is contained in:
Kevaundray Wedderburn 2021-01-06 20:15:48 +00:00
parent 171c3c08fe
commit 72b9a4fbd3
110 changed files with 1745 additions and 1765 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ide/src/syntax_tree.rs
View file

@ -85,7 +85,7 @@ fn syntax_tree_for_token(node: &SyntaxToken, text_range: TextRange) -> Option<St
.trim_end_matches('"')
.trim()
// Remove custom markers
.replace("<|>", "");
.replace("$0", "");
let parsed = SourceFile::parse(&text);
@ -182,7 +182,7 @@ SOURCE_FILE@0..60
#[test]
fn test_syntax_tree_with_range() {
let (analysis, range) = fixture::range(r#"<|>fn foo() {}<|>"#.trim());
let (analysis, range) = fixture::range(r#"$0fn foo() {}$0"#.trim());
let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
assert_eq_text!(
@ -206,10 +206,10 @@ FN@0..11
let (analysis, range) = fixture::range(
r#"fn test() {
<|>assert!("
$0assert!("
fn foo() {
}
", "");<|>
", "");$0
}"#
.trim(),
);
@ -243,8 +243,8 @@ EXPR_STMT@16..58
let (analysis, range) = fixture::range(
r#"fn test() {
assert!("
<|>fn foo() {
}<|>
$0fn foo() {
}$0
fn bar() {
}
", "");
@ -277,8 +277,8 @@ SOURCE_FILE@0..12
let (analysis, range) = fixture::range(
r###"fn test() {
assert!(r#"
<|>fn foo() {
}<|>
$0fn foo() {
}$0
fn bar() {
}
"#, "");
@ -310,11 +310,11 @@ SOURCE_FILE@0..12
// With a raw string
let (analysis, range) = fixture::range(
r###"fn test() {
assert!(r<|>#"
assert!(r$0#"
fn foo() {
}
fn bar() {
}"<|>#, "");
}"$0#, "");
}"###
.trim(),
);