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

add ssr fragment for expressions

Browse source
This commit is contained in:
Aleksey Kladov 2021-12-27 21:13:55 +03:00
parent 2d373dc53c
commit df2a996cb0
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ide_ssr/src/fragments.rs
View file

@ -35,3 +35,17 @@ pub(crate) fn item(s: &str) -> Result<SyntaxNode, ()> {
} }
Ok(node.syntax().clone()) Ok(node.syntax().clone())
} }
pub(crate) fn expr(s: &str) -> Result<SyntaxNode, ()> {
let template = "const _: () = {};";
let input = template.replace("{}", s);
let parse = syntax::SourceFile::parse(&input);
if !parse.errors().is_empty() {
return Err(());
}
let node = parse.tree().syntax().descendants().find_map(ast::Expr::cast).ok_or(())?;
if node.to_string() != s {
return Err(());
}
Ok(node.syntax().clone())
}

4
crates/ide_ssr/src/parsing.rs
View file

@ -74,8 +74,8 @@ impl ParsedRule {
}; };
let raw_template_stmt = raw_template.map(ast::Stmt::parse); let raw_template_stmt = raw_template.map(ast::Stmt::parse);
if let raw_template_expr @ Some(Ok(_)) = raw_template.map(ast::Expr::parse) { if let raw_template_expr @ Some(Ok(_)) = raw_template.map(fragments::expr) {
builder.try_add(ast::Expr::parse(&raw_pattern), raw_template_expr); builder.try_add2(fragments::expr(&raw_pattern), raw_template_expr);
} else { } else {
builder.try_add(ast::Expr::parse(&raw_pattern), raw_template_stmt.clone()); builder.try_add(ast::Expr::parse(&raw_pattern), raw_template_stmt.clone());
} }