From: Jeroen Vannevel Date: Sat, 22 Jan 2022 11:46:41 +0000 (+0000) Subject: removed prints X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=4ab7c4d99b469ae75a03ac0f987896022b218581;p=rust.git removed prints --- diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs index 3160bd5293a..3ceffbba97f 100644 --- a/crates/ide_assists/src/handlers/extract_function.rs +++ b/crates/ide_assists/src/handlers/extract_function.rs @@ -69,16 +69,12 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext) -> Option return None; } - println!("initial node: {:?}", node); - let node = match node { syntax::NodeOrToken::Node(n) => n, syntax::NodeOrToken::Token(t) => t.parent()?, }; - println!("next node: {:?}", node); let body = extraction_target(&node, range)?; - println!("body: {:?}", body); let container_info = body.analyze_container(&ctx.sema)?; let (locals_used, self_param) = body.analyze(&ctx.sema); @@ -187,8 +183,6 @@ fn extraction_target(node: &SyntaxNode, selection_range: TextRange) -> Option Option Option { fn from_range(parent: ast::StmtList, selected: TextRange) -> FunctionBody { let full_body = parent.syntax().children_with_tokens(); - for st in parent.syntax().children_with_tokens() { - println!("Statement: {:?}", &st); - } let mut text_range = full_body .map(|stmt| stmt.text_range()) .filter(|&stmt| selected.intersect(stmt).filter(|it| !it.is_empty()).is_some()) .reduce(|acc, stmt| acc.cover(stmt)); - println!("from_range text_range first: {:?}", text_range); if let Some(tail_range) = parent .tail_expr() .map(|it| it.syntax().text_range()) @@ -505,8 +493,6 @@ fn from_range(parent: ast::StmtList, selected: TextRange) -> FunctionBody { Some(text_range) => text_range.cover(tail_range), None => tail_range, }); - - println!("from_range text_range second: {:?}", text_range); } Self::Span { parent, text_range: text_range.unwrap_or(selected) } } @@ -1438,7 +1424,6 @@ fn make_body( FlowHandler::from_ret_ty(fun, &ret_ty) }; - println!("making body: {:?}", fun.body); let block = match &fun.body { FunctionBody::Expr(expr) => { let expr = rewrite_body_segment(ctx, &fun.params, &handler, expr.syntax()); @@ -1462,17 +1447,11 @@ fn make_body( .syntax() .children_with_tokens() .filter(|it| text_range.contains_range(it.text_range())) - .map(|it| match it { - syntax::NodeOrToken::Node(n) => { - println!("Found node: {:?}", n); - let node_rewritten = rewrite_body_segment(ctx, &fun.params, &handler, &n); - - syntax::NodeOrToken::Node(node_rewritten) - } - syntax::NodeOrToken::Token(t) => { - println!("Found token: {:?}", t); - syntax::NodeOrToken::Token(t) - } + .map(|it| match &it { + syntax::NodeOrToken::Node(n) => syntax::NodeOrToken::Node( + rewrite_body_segment(ctx, &fun.params, &handler, &n), + ), + syntax::NodeOrToken::Token(_) => it, }) .collect(); @@ -1520,10 +1499,6 @@ fn make_body( .collect::>(); let tail_expr = tail_expr.map(|expr| expr.dedent(old_indent).indent(body_indent)); - for element in &elements { - println!("element: {:?}", element); - } - make::hacky_block_expr_with_comments(elements, tail_expr) } }; diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs index 9498defb3f3..8a1bcebbf67 100644 --- a/crates/syntax/src/ast/make.rs +++ b/crates/syntax/src/ast/make.rs @@ -331,7 +331,7 @@ pub fn block_expr( /// Ideally this function wouldn't exist since it involves manual indenting. /// It differs from `make::block_expr` by also supporting comments. -/// +/// /// FIXME: replace usages of this with the mutable syntax tree API pub fn hacky_block_expr_with_comments( elements: impl IntoIterator,