summaryrefslogtreecommitdiff
path: root/cli/tools/fmt.rs
diff options
context:
space:
mode:
Diffstat (limited to 'cli/tools/fmt.rs')
-rw-r--r--cli/tools/fmt.rs96
1 files changed, 48 insertions, 48 deletions
diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs
index 59f9ddc8b..b3dfc86e8 100644
--- a/cli/tools/fmt.rs
+++ b/cli/tools/fmt.rs
@@ -13,6 +13,7 @@ use crate::file_watcher;
use crate::file_watcher::ResolutionResult;
use crate::fs_util::{collect_files, get_extension, is_supported_ext_fmt};
use crate::text_encoding;
+use deno_ast::ParsedSource;
use deno_core::error::generic_error;
use deno_core::error::AnyError;
use deno_core::futures;
@@ -62,16 +63,13 @@ pub async fn format(
}
}
};
- let operation = |paths: Vec<PathBuf>| {
- let config = get_typescript_config();
- async move {
- if check {
- check_source_files(config, paths).await?;
- } else {
- format_source_files(config, paths).await?;
- }
- Ok(())
+ let operation = |paths: Vec<PathBuf>| async move {
+ if check {
+ check_source_files(paths).await?;
+ } else {
+ format_source_files(paths).await?;
}
+ Ok(())
};
if watch {
@@ -91,14 +89,10 @@ pub async fn format(
/// Formats markdown (using <https://github.com/dprint/dprint-plugin-markdown>) and its code blocks
/// (ts/tsx, js/jsx).
-fn format_markdown(
- file_text: &str,
- ts_config: dprint_plugin_typescript::configuration::Configuration,
-) -> Result<String, String> {
- let md_config = get_markdown_config();
+fn format_markdown(file_text: &str) -> Result<String, String> {
dprint_plugin_markdown::format_text(
file_text,
- &md_config,
+ &MARKDOWN_CONFIG,
move |tag, text, line_width| {
let tag = tag.to_lowercase();
if matches!(
@@ -121,13 +115,13 @@ fn format_markdown(
};
if matches!(extension, "json" | "jsonc") {
- let mut json_config = get_json_config();
+ let mut json_config = JSON_CONFIG.clone();
json_config.line_width = line_width;
dprint_plugin_json::format_text(text, &json_config)
} else {
let fake_filename =
PathBuf::from(format!("deno_fmt_stdin.{}", extension));
- let mut codeblock_config = ts_config.clone();
+ let mut codeblock_config = TYPESCRIPT_CONFIG.clone();
codeblock_config.line_width = line_width;
dprint_plugin_typescript::format_text(
&fake_filename,
@@ -147,8 +141,7 @@ fn format_markdown(
/// of configuration builder of <https://github.com/dprint/dprint-plugin-json>.
/// See <https://git.io/Jt4ht> for configuration.
fn format_json(file_text: &str) -> Result<String, String> {
- let json_config = get_json_config();
- dprint_plugin_json::format_text(file_text, &json_config)
+ dprint_plugin_json::format_text(file_text, &JSON_CONFIG)
.map_err(|e| e.to_string())
}
@@ -156,23 +149,40 @@ fn format_json(file_text: &str) -> Result<String, String> {
pub fn format_file(
file_path: &Path,
file_text: &str,
- config: dprint_plugin_typescript::configuration::Configuration,
) -> Result<String, String> {
let ext = get_extension(file_path).unwrap_or_else(String::new);
if ext == "md" {
- format_markdown(file_text, config)
+ format_markdown(file_text)
} else if matches!(ext.as_str(), "json" | "jsonc") {
format_json(file_text)
} else {
- dprint_plugin_typescript::format_text(file_path, file_text, &config)
- .map_err(|e| e.to_string())
+ dprint_plugin_typescript::format_text(
+ file_path,
+ file_text,
+ &TYPESCRIPT_CONFIG,
+ )
+ .map_err(|e| e.to_string())
}
}
-async fn check_source_files(
- config: dprint_plugin_typescript::configuration::Configuration,
- paths: Vec<PathBuf>,
-) -> Result<(), AnyError> {
+pub fn format_parsed_module(parsed_source: &ParsedSource) -> String {
+ dprint_plugin_typescript::format_parsed_file(
+ &dprint_plugin_typescript::SourceFileInfo {
+ is_jsx: matches!(
+ parsed_source.media_type(),
+ deno_ast::MediaType::Jsx | deno_ast::MediaType::Tsx
+ ),
+ info: parsed_source.source(),
+ leading_comments: parsed_source.comments().leading_map(),
+ trailing_comments: parsed_source.comments().trailing_map(),
+ module: parsed_source.module(),
+ tokens: parsed_source.tokens(),
+ },
+ &TYPESCRIPT_CONFIG,
+ )
+}
+
+async fn check_source_files(paths: Vec<PathBuf>) -> Result<(), AnyError> {
let not_formatted_files_count = Arc::new(AtomicUsize::new(0));
let checked_files_count = Arc::new(AtomicUsize::new(0));
@@ -186,7 +196,7 @@ async fn check_source_files(
checked_files_count.fetch_add(1, Ordering::Relaxed);
let file_text = read_file_contents(&file_path)?.text;
- match format_file(&file_path, &file_text, config) {
+ match format_file(&file_path, &file_text) {
Ok(formatted_text) => {
if formatted_text != file_text {
not_formatted_files_count.fetch_add(1, Ordering::Relaxed);
@@ -225,10 +235,7 @@ async fn check_source_files(
}
}
-async fn format_source_files(
- config: dprint_plugin_typescript::configuration::Configuration,
- paths: Vec<PathBuf>,
-) -> Result<(), AnyError> {
+async fn format_source_files(paths: Vec<PathBuf>) -> Result<(), AnyError> {
let formatted_files_count = Arc::new(AtomicUsize::new(0));
let checked_files_count = Arc::new(AtomicUsize::new(0));
let output_lock = Arc::new(Mutex::new(0)); // prevent threads outputting at the same time
@@ -240,7 +247,7 @@ async fn format_source_files(
checked_files_count.fetch_add(1, Ordering::Relaxed);
let file_contents = read_file_contents(&file_path)?;
- match format_file(&file_path, &file_contents.text, config) {
+ match format_file(&file_path, &file_contents.text) {
Ok(formatted_text) => {
if formatted_text != file_contents.text {
write_file_contents(
@@ -291,10 +298,9 @@ pub fn format_stdin(check: bool, ext: String) -> Result<(), AnyError> {
if stdin().read_to_string(&mut source).is_err() {
return Err(generic_error("Failed to read from stdin"));
}
- let config = get_typescript_config();
let file_path = PathBuf::from(format!("_stdin.{}", ext));
- match format_file(&file_path, &source, config) {
+ match format_file(&file_path, &source) {
Ok(formatted_text) => {
if check {
if formatted_text != source {
@@ -319,24 +325,18 @@ fn files_str(len: usize) -> &'static str {
}
}
-pub fn get_typescript_config(
-) -> dprint_plugin_typescript::configuration::Configuration {
- dprint_plugin_typescript::configuration::ConfigurationBuilder::new()
+lazy_static::lazy_static! {
+ static ref TYPESCRIPT_CONFIG: dprint_plugin_typescript::configuration::Configuration = dprint_plugin_typescript::configuration::ConfigurationBuilder::new()
.deno()
- .build()
-}
+ .build();
-fn get_markdown_config() -> dprint_plugin_markdown::configuration::Configuration
-{
- dprint_plugin_markdown::configuration::ConfigurationBuilder::new()
+ static ref MARKDOWN_CONFIG: dprint_plugin_markdown::configuration::Configuration = dprint_plugin_markdown::configuration::ConfigurationBuilder::new()
.deno()
- .build()
-}
+ .build();
-fn get_json_config() -> dprint_plugin_json::configuration::Configuration {
- dprint_plugin_json::configuration::ConfigurationBuilder::new()
+ static ref JSON_CONFIG: dprint_plugin_json::configuration::Configuration = dprint_plugin_json::configuration::ConfigurationBuilder::new()
.deno()
- .build()
+ .build();
}
struct FileContents {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 15:37:13 +0000