diff options
| -rw-r--r-- | cli/fmt.rs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/cli/fmt.rs b/cli/fmt.rs index 986be9fe1..c26c76d56 100644 --- a/cli/fmt.rs +++ b/cli/fmt.rs @@ -7,9 +7,7 @@ //! the future it can be easily extended to provide //! the same functions as ops available in JS runtime. -use dprint_plugin_typescript::format_text; -use dprint_plugin_typescript::Configuration; -use dprint_plugin_typescript::ConfigurationBuilder; +use dprint_plugin_typescript as dprint; use glob; use regex::Regex; use std::fs; @@ -29,10 +27,14 @@ fn is_supported(path: &Path) -> bool { && (TYPESCRIPT.is_match(&path_str) || JAVASCRIPT.is_match(&path_str)) } -fn get_config() -> Configuration { - ConfigurationBuilder::new() +fn get_config() -> dprint::Configuration { + dprint::ConfigurationBuilder::new() .line_width(80) .indent_width(2) + .next_control_flow_position(dprint::NextControlFlowPosition::SameLine) + .force_multi_line_parameters(true) + .force_multi_line_arguments(true) + .binary_expression_operator_position(dprint::OperatorPosition::SameLine) .build() } @@ -48,14 +50,14 @@ fn get_supported_files(paths: Vec<PathBuf>) -> Vec<PathBuf> { files_to_check } -fn check_source_files(config: Configuration, paths: Vec<PathBuf>) { +fn check_source_files(config: dprint::Configuration, paths: Vec<PathBuf>) { let start = Instant::now(); let mut not_formatted_files = vec![]; for file_path in paths { let file_path_str = file_path.to_string_lossy(); let file_contents = fs::read_to_string(&file_path).unwrap(); - match format_text(&file_path_str, &file_contents, &config) { + match dprint::format_text(&file_path_str, &file_contents, &config) { Ok(None) => { // nothing to format, pass } @@ -91,14 +93,14 @@ fn check_source_files(config: Configuration, paths: Vec<PathBuf>) { } } -fn format_source_files(config: Configuration, paths: Vec<PathBuf>) { +fn format_source_files(config: dprint::Configuration, paths: Vec<PathBuf>) { let start = Instant::now(); let mut not_formatted_files = vec![]; for file_path in paths { let file_path_str = file_path.to_string_lossy(); let file_contents = fs::read_to_string(&file_path).unwrap(); - match format_text(&file_path_str, &file_contents, &config) { + match dprint::format_text(&file_path_str, &file_contents, &config) { Ok(None) => { // nothing to format, pass } |