language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Nice string formatting

Browse source
This commit is contained in:
Aleksey Kladov 2020-03-28 11:08:19 +01:00
parent b764c38436
commit 6596e7cddf
11 changed files with 38 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
//! This module contains free-standing functions for creating AST fragments out
//! of smaller pieces.
use itertools::Itertools;
use stdx::format_to;
use crate::{ast, AstNode, SourceFile, SyntaxKind, SyntaxNode, SyntaxToken};
@ -34,14 +35,14 @@ pub fn use_tree(
let mut buf = "use ".to_string();
buf += &path.syntax().to_string();
if let Some(use_tree_list) = use_tree_list {
buf += &format!("::{}", use_tree_list);
format_to!(buf, "::{}", use_tree_list);
}
if add_star {
buf += "::*";
}
if let Some(alias) = alias {
buf += &format!(" {}", alias);
format_to!(buf, " {}", alias);
}
ast_from_text(&buf)
}
@ -70,15 +71,15 @@ pub fn block_expr(
stmts: impl IntoIterator<Item = ast::Stmt>,
tail_expr: Option<ast::Expr>,
) -> ast::BlockExpr {
let mut text = "{\n".to_string();
let mut buf = "{\n".to_string();
for stmt in stmts.into_iter() {
text += &format!(" {}\n", stmt);
format_to!(buf, " {}\n", stmt);
}
if let Some(tail_expr) = tail_expr {
text += &format!(" {}\n", tail_expr)
format_to!(buf, " {}\n", tail_expr)
}
text += "}";
ast_from_text(&format!("fn f() {}", text))
buf += "}";
ast_from_text(&format!("fn f() {}", buf))
}
pub fn block_from_expr(e: ast::Expr) -> ast::Block {

7
crates/ra_syntax/src/lib.rs
View file

@ -32,9 +32,10 @@ pub mod ast;
#[doc(hidden)]
pub mod fuzz;
use std::{fmt::Write, marker::PhantomData, sync::Arc};
use std::{marker::PhantomData, sync::Arc};
use ra_text_edit::AtomTextEdit;
use stdx::format_to;
use crate::syntax_node::GreenNode;
@ -115,7 +116,7 @@ impl Parse<SourceFile> {
pub fn debug_dump(&self) -> String {
let mut buf = format!("{:#?}", self.tree().syntax());
for err in self.errors.iter() {
writeln!(buf, "error {:?}: {}", err.range(), err).unwrap();
format_to!(buf, "error {:?}: {}\n", err.range(), err);
}
buf
}
@ -296,7 +297,7 @@ fn api_walkthrough() {
NodeOrToken::Node(it) => it.text().to_string(),
NodeOrToken::Token(it) => it.text().to_string(),
};
buf += &format!("{:indent$}{:?} {:?}\n", " ", text, node.kind(), indent = indent);
format_to!(buf, "{:indent$}{:?} {:?}\n", " ", text, node.kind(), indent = indent);
indent += 2;
}
WalkEvent::Leave(_) => indent -= 2,