foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-25 15:29:32 -05:00
Code Issues Packages 1 Wiki Activity

fix(cli/fmt): show filepath for InvalidData error (#17361)

Browse source
This commit is contained in:
Leo Kettmeir 2023-01-16 01:30:52 +01:00 committed by Bartek Iwańczuk
parent bac880e734
commit 24fc295423
No known key found for this signature in database
GPG key ID: 0C6BCDDC3B3AD750
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/tests/integration/fmt_tests.rs
View file

@ -189,6 +189,12 @@ itest!(fmt_check_parse_error {
exit_code: 1, exit_code: 1,
}); });
itest!(fmt_check_invalid_data {
args: "fmt --check fmt/invalid_data.json",
output: "fmt/invalid_data.out",
exit_code: 1,
});
itest!(fmt_stdin { itest!(fmt_stdin {
args: "fmt -", args: "fmt -",
input: Some("const a = 1\n"), input: Some("const a = 1\n"),

BIN
cli/tests/testdata/fmt/invalid_data.json vendored Normal file
View file

Binary file not shown.

1
cli/tests/testdata/fmt/invalid_data.out vendored Normal file
View file

@ -0,0 +1 @@
error: [WILDCARD] is not a valid UTF-8 file

6
cli/tools/fmt.rs
View file

@ -20,6 +20,7 @@ use crate::util::fs::FileCollector;
use crate::util::path::get_extension; use crate::util::path::get_extension;
use crate::util::text_encoding; use crate::util::text_encoding;
use deno_ast::ParsedSource; use deno_ast::ParsedSource;
use deno_core::anyhow::anyhow;
use deno_core::anyhow::bail; use deno_core::anyhow::bail;
use deno_core::anyhow::Context; use deno_core::anyhow::Context;
use deno_core::error::generic_error; use deno_core::error::generic_error;
@ -574,7 +575,10 @@ fn read_file_contents(file_path: &Path) -> Result<FileContents, AnyError> {
let file_bytes = fs::read(file_path) let file_bytes = fs::read(file_path)
.with_context(|| format!("Error reading {}", file_path.display()))?; .with_context(|| format!("Error reading {}", file_path.display()))?;
let charset = text_encoding::detect_charset(&file_bytes); let charset = text_encoding::detect_charset(&file_bytes);
let file_text = text_encoding::convert_to_utf8(&file_bytes, charset)?; let file_text = text_encoding::convert_to_utf8(&file_bytes, charset)
.map_err(|_| {
anyhow!("{} is not a valid UTF-8 file", file_path.display())
})?;
let had_bom = file_text.starts_with(text_encoding::BOM_CHAR); let had_bom = file_text.starts_with(text_encoding::BOM_CHAR);
let text = if had_bom { let text = if had_bom {
text_encoding::strip_bom(&file_text).to_string() text_encoding::strip_bom(&file_text).to_string()