language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

test formatting

Browse source
This commit is contained in:
Aleksey Kladov 2021-10-10 11:22:12 +03:00
parent 2510eaa9b2
commit b0a104cbd1
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/hir_def/src/macro_expansion_tests.rs
View file

@ -20,7 +20,7 @@ use stdx::format_to;
use syntax::{ use syntax::{
ast::{self, edit::IndentLevel}, ast::{self, edit::IndentLevel},
AstNode, AstNode,
SyntaxKind::{self, IDENT, LIFETIME_IDENT}, SyntaxKind::{EOF, IDENT, LIFETIME_IDENT},
SyntaxNode, T, SyntaxNode, T,
}; };
@ -109,7 +109,7 @@ fn reindent(indent: IndentLevel, pp: String) -> String {
fn pretty_print_macro_expansion(expn: SyntaxNode) -> String { fn pretty_print_macro_expansion(expn: SyntaxNode) -> String {
let mut res = String::new(); let mut res = String::new();
let mut prev_kind = SyntaxKind::EOF; let mut prev_kind = EOF;
let mut indent_level = 0; let mut indent_level = 0;
for token in iter::successors(expn.first_token(), |t| t.next_token()) { for token in iter::successors(expn.first_token(), |t| t.next_token()) {
let curr_kind = token.kind(); let curr_kind = token.kind();
@ -129,6 +129,8 @@ fn pretty_print_macro_expansion(expn: SyntaxNode) -> String {
(T![->], _) | (_, T![->]) => " ", (T![->], _) | (_, T![->]) => " ",
(T![&&], _) | (_, T![&&]) => " ", (T![&&], _) | (_, T![&&]) => " ",
(T![,], _) => " ", (T![,], _) => " ",
(T![fn], T!['(']) => "",
_ if prev_kind.is_keyword() => " ",
_ => "", _ => "",
}; };

4
crates/hir_def/src/macro_expansion_tests/mbe.rs
View file

@ -816,7 +816,7 @@ macro_rules! m {
fn bar() -> & 'a Baz<u8> {} fn bar() -> & 'a Baz<u8> {}
fn bar() -> extern"Rust"fn() -> Ret {} fn bar() -> extern "Rust"fn() -> Ret {}
"#]], "#]],
); );
} }
@ -835,7 +835,7 @@ macro_rules! m {
($p:pat) => { fn foo() { let $p; } } ($p:pat) => { fn foo() { let $p; } }
} }
fn foo() { fn foo() {
let(a, b); let (a, b);
} }
"#]], "#]],
); );

10
crates/hir_def/src/macro_expansion_tests/mbe/tt_conversion.rs
View file

@ -53,11 +53,11 @@ macro_rules! m {
} }
} }
fn f() { fn f() {
let_ = 'c'; let _ = 'c';
let_ = 1000; let _ = 1000;
let_ = 12E+99_f64; let _ = 12E+99_f64;
let_ = "rust1"; let _ = "rust1";
let_ = -92; let _ = -92;
} }
"#]], "#]],
); );