squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

More orthogonal API for building paths

Browse source
This commit is contained in:
Aleksey Kladov 2020-02-29 11:55:36 +01:00
parent 7cf710c66f
commit ca713e462b
3 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
crates/ra_assists/src/handlers/early_return.rs
View file

@ -112,16 +112,19 @@ pub(crate) fn convert_to_guarded_return(ctx: AssistCtx) -> Option<Assist> {
Some((path, bound_ident)) => {
// If-let.
let match_expr = {
let happy_arm = make::match_arm(
once(
make::tuple_struct_pat(
path,
once(make::bind_pat(make::name("it")).into()),
)
.into(),
),
make::expr_path(make::path_from_name_ref(make::name_ref("it"))),
);
let happy_arm = {
let pat = make::tuple_struct_pat(
path,
once(make::bind_pat(make::name("it")).into()),
);
let expr = {
let name_ref = make::name_ref("it");
let segment = make::path_segment(name_ref);
let path = make::path_unqalified(segment);
make::expr_path(path)
};
make::match_arm(once(pat.into()), expr)
};
let sad_arm = make::match_arm(
// FIXME: would be cool to use `None` or `Err(_)` if appropriate

6
crates/ra_assists/src/handlers/move_bounds.rs
View file

@ -72,7 +72,11 @@ pub(crate) fn move_bounds_to_where_clause(ctx: AssistCtx) -> Option<Assist> {
}
fn build_predicate(param: ast::TypeParam) -> Option<ast::WherePred> {
let path = make::path_from_name_ref(make::name_ref(&param.name()?.syntax().to_string()));
let path = {
let name_ref = make::name_ref(&param.name()?.syntax().to_string());
let segment = make::path_segment(name_ref);
make::path_unqalified(segment)
};
let predicate = make::where_pred(path, param.type_bound_list()?.bounds());
Some(predicate)
}

11
crates/ra_syntax/src/ast/make.rs
View file

@ -12,11 +12,14 @@ pub fn name_ref(text: &str) -> ast::NameRef {
ast_from_text(&format!("fn f() {{ {}; }}", text))
}
pub fn path_from_name_ref(name_ref: ast::NameRef) -> ast::Path {
path_from_text(&name_ref.syntax().to_string())
pub fn path_segment(name_ref: ast::NameRef) -> ast::PathSegment {
ast_from_text(&format!("use {};", name_ref.syntax()))
}
pub fn path_qualified(qual: ast::Path, name_ref: ast::NameRef) -> ast::Path {
path_from_text(&format!("{}::{}", qual.syntax(), name_ref.syntax()))
pub fn path_unqalified(segment: ast::PathSegment) -> ast::Path {
path_from_text(&format!("use {}", segment.syntax()))
}
pub fn path_qualified(qual: ast::Path, segment: ast::PathSegment) -> ast::Path {
path_from_text(&format!("{}::{}", qual.syntax(), segment.syntax()))
}
fn path_from_text(text: &str) -> ast::Path {
ast_from_text(text)