language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #7610

Browse source 
7610: Cleanup test r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-02-09 14:49:02 +00:00 • committed by GitHub
commit fca93cfed3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 234 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

41
crates/ide/src/join_lines.rs
View file

@ -270,27 +270,28 @@ fn foo() {
#[test] #[test]
fn test_join_lines_diverging_block() { fn test_join_lines_diverging_block() {
let before = r" check_join_lines(
fn foo() { r"
loop { fn foo() {
match x { loop {
92 => $0{ match x {
continue; 92 => $0{
} continue;
}
}
} }
"; }
let after = r" }
fn foo() { }
loop { ",
match x { r"
92 => $0continue, fn foo() {
} loop {
} match x {
} 92 => $0continue,
"; }
check_join_lines(before, after); }
}
",
);
} }
#[test] #[test]

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

@ -100,147 +100,137 @@ fn syntax_tree_for_token(node: &SyntaxToken, text_range: TextRange) -> Option<St
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use test_utils::assert_eq_text; use expect_test::expect;
use crate::fixture; use crate::fixture;
fn check(ra_fixture: &str, expect: expect_test::Expect) {
let (analysis, file_id) = fixture::file(ra_fixture);
let syn = analysis.syntax_tree(file_id, None).unwrap();
expect.assert_eq(&syn)
}
fn check_range(ra_fixture: &str, expect: expect_test::Expect) {
let (analysis, frange) = fixture::range(ra_fixture);
let syn = analysis.syntax_tree(frange.file_id, Some(frange.range)).unwrap();
expect.assert_eq(&syn)
}
#[test] #[test]
fn test_syntax_tree_without_range() { fn test_syntax_tree_without_range() {
// Basic syntax // Basic syntax
let (analysis, file_id) = fixture::file(r#"fn foo() {}"#); check(
let syn = analysis.syntax_tree(file_id, None).unwrap(); r#"fn foo() {}"#,
expect![[r#"
assert_eq_text!( SOURCE_FILE@0..11
r#" FN@0..11
SOURCE_FILE@0..11 FN_KW@0..2 "fn"
FN@0..11 WHITESPACE@2..3 " "
FN_KW@0..2 "fn" NAME@3..6
WHITESPACE@2..3 " " IDENT@3..6 "foo"
NAME@3..6 PARAM_LIST@6..8
IDENT@3..6 "foo" L_PAREN@6..7 "("
PARAM_LIST@6..8 R_PAREN@7..8 ")"
L_PAREN@6..7 "(" WHITESPACE@8..9 " "
R_PAREN@7..8 ")" BLOCK_EXPR@9..11
WHITESPACE@8..9 " " L_CURLY@9..10 "{"
BLOCK_EXPR@9..11 R_CURLY@10..11 "}"
L_CURLY@9..10 "{" "#]],
R_CURLY@10..11 "}"
"#
.trim(),
syn.trim()
); );
let (analysis, file_id) = fixture::file( check(
r#" r#"
fn test() { fn test() {
assert!(" assert!("
fn foo() { fn foo() {
} }
", ""); ", "");
}"# }"#,
.trim(), expect![[r#"
); SOURCE_FILE@0..60
let syn = analysis.syntax_tree(file_id, None).unwrap(); FN@0..60
FN_KW@0..2 "fn"
assert_eq_text!( WHITESPACE@2..3 " "
r#" NAME@3..7
SOURCE_FILE@0..60 IDENT@3..7 "test"
FN@0..60 PARAM_LIST@7..9
FN_KW@0..2 "fn" L_PAREN@7..8 "("
WHITESPACE@2..3 " " R_PAREN@8..9 ")"
NAME@3..7 WHITESPACE@9..10 " "
IDENT@3..7 "test" BLOCK_EXPR@10..60
PARAM_LIST@7..9 L_CURLY@10..11 "{"
L_PAREN@7..8 "(" WHITESPACE@11..16 "\n "
R_PAREN@8..9 ")" EXPR_STMT@16..58
WHITESPACE@9..10 " " MACRO_CALL@16..57
BLOCK_EXPR@10..60 PATH@16..22
L_CURLY@10..11 "{" PATH_SEGMENT@16..22
WHITESPACE@11..16 "\n " NAME_REF@16..22
EXPR_STMT@16..58 IDENT@16..22 "assert"
MACRO_CALL@16..57 BANG@22..23 "!"
PATH@16..22 TOKEN_TREE@23..57
PATH_SEGMENT@16..22 L_PAREN@23..24 "("
NAME_REF@16..22 STRING@24..52 "\"\n fn foo() {\n ..."
IDENT@16..22 "assert" COMMA@52..53 ","
BANG@22..23 "!" WHITESPACE@53..54 " "
TOKEN_TREE@23..57 STRING@54..56 "\"\""
L_PAREN@23..24 "(" R_PAREN@56..57 ")"
STRING@24..52 "\"\n fn foo() {\n ..." SEMICOLON@57..58 ";"
COMMA@52..53 "," WHITESPACE@58..59 "\n"
WHITESPACE@53..54 " " R_CURLY@59..60 "}"
STRING@54..56 "\"\"" "#]],
R_PAREN@56..57 ")" )
SEMICOLON@57..58 ";"
WHITESPACE@58..59 "\n"
R_CURLY@59..60 "}"
"#
.trim(),
syn.trim()
);
} }
#[test] #[test]
fn test_syntax_tree_with_range() { fn test_syntax_tree_with_range() {
let (analysis, range) = fixture::range(r#"$0fn foo() {}$0"#.trim()); check_range(
let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap(); r#"$0fn foo() {}$0"#,
expect![[r#"
assert_eq_text!( FN@0..11
r#" FN_KW@0..2 "fn"
FN@0..11 WHITESPACE@2..3 " "
FN_KW@0..2 "fn" NAME@3..6
WHITESPACE@2..3 " " IDENT@3..6 "foo"
NAME@3..6 PARAM_LIST@6..8
IDENT@3..6 "foo" L_PAREN@6..7 "("
PARAM_LIST@6..8 R_PAREN@7..8 ")"
L_PAREN@6..7 "(" WHITESPACE@8..9 " "
R_PAREN@7..8 ")" BLOCK_EXPR@9..11
WHITESPACE@8..9 " " L_CURLY@9..10 "{"
BLOCK_EXPR@9..11 R_CURLY@10..11 "}"
L_CURLY@9..10 "{" "#]],
R_CURLY@10..11 "}"
"#
.trim(),
syn.trim()
); );
let (analysis, range) = fixture::range( check_range(
r#"fn test() { r#"
fn test() {
$0assert!(" $0assert!("
fn foo() { fn foo() {
} }
", "");$0 ", "");$0
}"# }"#,
.trim(), expect![[r#"
); EXPR_STMT@16..58
let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap(); MACRO_CALL@16..57
PATH@16..22
assert_eq_text!( PATH_SEGMENT@16..22
r#" NAME_REF@16..22
EXPR_STMT@16..58 IDENT@16..22 "assert"
MACRO_CALL@16..57 BANG@22..23 "!"
PATH@16..22 TOKEN_TREE@23..57
PATH_SEGMENT@16..22 L_PAREN@23..24 "("
NAME_REF@16..22 STRING@24..52 "\"\n fn foo() {\n ..."
IDENT@16..22 "assert" COMMA@52..53 ","
BANG@22..23 "!" WHITESPACE@53..54 " "
TOKEN_TREE@23..57 STRING@54..56 "\"\""
L_PAREN@23..24 "(" R_PAREN@56..57 ")"
STRING@24..52 "\"\n fn foo() {\n ..." SEMICOLON@57..58 ";"
COMMA@52..53 "," "#]],
WHITESPACE@53..54 " "
STRING@54..56 "\"\""
R_PAREN@56..57 ")"
SEMICOLON@57..58 ";"
"#
.trim(),
syn.trim()
); );
} }
#[test] #[test]
fn test_syntax_tree_inside_string() { fn test_syntax_tree_inside_string() {
let (analysis, range) = fixture::range( check_range(
r#"fn test() { r#"fn test() {
assert!(" assert!("
$0fn foo() { $0fn foo() {
@ -248,33 +238,27 @@ $0fn foo() {
fn bar() { fn bar() {
} }
", ""); ", "");
}"# }"#,
.trim(), expect![[r#"
); SOURCE_FILE@0..12
let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap(); FN@0..12
assert_eq_text!( FN_KW@0..2 "fn"
r#" WHITESPACE@2..3 " "
SOURCE_FILE@0..12 NAME@3..6
FN@0..12 IDENT@3..6 "foo"
FN_KW@0..2 "fn" PARAM_LIST@6..8
WHITESPACE@2..3 " " L_PAREN@6..7 "("
NAME@3..6 R_PAREN@7..8 ")"
IDENT@3..6 "foo" WHITESPACE@8..9 " "
PARAM_LIST@6..8 BLOCK_EXPR@9..12
L_PAREN@6..7 "(" L_CURLY@9..10 "{"
R_PAREN@7..8 ")" WHITESPACE@10..11 "\n"
WHITESPACE@8..9 " " R_CURLY@11..12 "}"
BLOCK_EXPR@9..12 "#]],
L_CURLY@9..10 "{"
WHITESPACE@10..11 "\n"
R_CURLY@11..12 "}"
"#
.trim(),
syn.trim()
); );
// With a raw string // With a raw string
let (analysis, range) = fixture::range( check_range(
r###"fn test() { r###"fn test() {
assert!(r#" assert!(r#"
$0fn foo() { $0fn foo() {
@ -282,76 +266,64 @@ $0fn foo() {
fn bar() { fn bar() {
} }
"#, ""); "#, "");
}"### }"###,
.trim(), expect![[r#"
); SOURCE_FILE@0..12
let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap(); FN@0..12
assert_eq_text!( FN_KW@0..2 "fn"
r#" WHITESPACE@2..3 " "
SOURCE_FILE@0..12 NAME@3..6
FN@0..12 IDENT@3..6 "foo"
FN_KW@0..2 "fn" PARAM_LIST@6..8
WHITESPACE@2..3 " " L_PAREN@6..7 "("
NAME@3..6 R_PAREN@7..8 ")"
IDENT@3..6 "foo" WHITESPACE@8..9 " "
PARAM_LIST@6..8 BLOCK_EXPR@9..12
L_PAREN@6..7 "(" L_CURLY@9..10 "{"
R_PAREN@7..8 ")" WHITESPACE@10..11 "\n"
WHITESPACE@8..9 " " R_CURLY@11..12 "}"
BLOCK_EXPR@9..12 "#]],
L_CURLY@9..10 "{"
WHITESPACE@10..11 "\n"
R_CURLY@11..12 "}"
"#
.trim(),
syn.trim()
); );
// With a raw string // With a raw string
let (analysis, range) = fixture::range( check_range(
r###"fn test() { r###"fn test() {
assert!(r$0#" assert!(r$0#"
fn foo() { fn foo() {
} }
fn bar() { fn bar() {
}"$0#, ""); }"$0#, "");
}"### }"###,
.trim(), expect![[r#"
); SOURCE_FILE@0..25
let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap(); FN@0..12
assert_eq_text!( FN_KW@0..2 "fn"
r#" WHITESPACE@2..3 " "
SOURCE_FILE@0..25 NAME@3..6
FN@0..12 IDENT@3..6 "foo"
FN_KW@0..2 "fn" PARAM_LIST@6..8
WHITESPACE@2..3 " " L_PAREN@6..7 "("
NAME@3..6 R_PAREN@7..8 ")"
IDENT@3..6 "foo" WHITESPACE@8..9 " "
PARAM_LIST@6..8 BLOCK_EXPR@9..12
L_PAREN@6..7 "(" L_CURLY@9..10 "{"
R_PAREN@7..8 ")" WHITESPACE@10..11 "\n"
WHITESPACE@8..9 " " R_CURLY@11..12 "}"
BLOCK_EXPR@9..12 WHITESPACE@12..13 "\n"
L_CURLY@9..10 "{" FN@13..25
WHITESPACE@10..11 "\n" FN_KW@13..15 "fn"
R_CURLY@11..12 "}" WHITESPACE@15..16 " "
WHITESPACE@12..13 "\n" NAME@16..19
FN@13..25 IDENT@16..19 "bar"
FN_KW@13..15 "fn" PARAM_LIST@19..21
WHITESPACE@15..16 " " L_PAREN@19..20 "("
NAME@16..19 R_PAREN@20..21 ")"
IDENT@16..19 "bar" WHITESPACE@21..22 " "
PARAM_LIST@19..21 BLOCK_EXPR@22..25
L_PAREN@19..20 "(" L_CURLY@22..23 "{"
R_PAREN@20..21 ")" WHITESPACE@23..24 "\n"
WHITESPACE@21..22 " " R_CURLY@24..25 "}"
BLOCK_EXPR@22..25 "#]],
L_CURLY@22..23 "{"
WHITESPACE@23..24 "\n"
R_CURLY@24..25 "}"
"#
.trim(),
syn.trim()
); );
} }
} }

44
editors/code/package.json
View file

@ -950,6 +950,50 @@
{ {
"id": "formatSpecifier", "id": "formatSpecifier",
"description": "Style for {} placeholders in format strings" "description": "Style for {} placeholders in format strings"
},
{
"id": "punctuation",
"description": "generic punctuation"
},
{
"id": "parenthesis",
"description": "( or )",
"superType": "punctuation"
},
{
"id": "bracket",
"description": "[ or ]",
"superType": "punctuation"
},
{
"id": "brace",
"description": "{ or }",
"superType": "punctuation"
},
{
"id": "angle",
"description": "< or >",
"superType": "punctuation"
},
{
"id": "comma",
"description": ",",
"superType": "punctuation"
},
{
"id": "colon",
"description": ":",
"superType": "punctuation"
},
{
"id": "semicolon",
"description": ";",
"superType": "punctuation"
},
{
"id": "dot",
"description": ".",
"superType": "punctuation"
} }
], ],
"semanticTokenModifiers": [ "semanticTokenModifiers": [