diff options
| author | Kitson Kelly <me@kitsonkelly.com> | 2020-09-29 17:16:12 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 17:16:12 +1000 |
| commit | b014a98534ca10283965a7996fc4e6a5f0dec421 (patch) | |
| tree | cca34dae75f4b73d0d08381ba9b31d963724f146 /cli/tsc.rs | |
| parent | 970d412a0830a06cdd75b49d2c16dcc933af382a (diff) | |
refactor: improve graph and tsc_config (#7747)
Diffstat (limited to 'cli/tsc.rs')
| -rw-r--r-- | cli/tsc.rs | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/cli/tsc.rs b/cli/tsc.rs index 245247f13..9b944125f 100644 --- a/cli/tsc.rs +++ b/cli/tsc.rs @@ -41,7 +41,6 @@ use std::collections::HashSet; use std::fs; use std::io; use std::ops::Deref; -use std::path::Path; use std::path::PathBuf; use std::str; use std::sync::Arc; @@ -141,14 +140,9 @@ lazy_static! { fn warn_ignored_options( maybe_ignored_options: Option<tsc_config::IgnoredCompilerOptions>, - config_path: &Path, ) { if let Some(ignored_options) = maybe_ignored_options { - eprintln!( - "Unsupported compiler options in \"{}\"\n The following options were ignored:\n {}", - config_path.to_string_lossy(), - ignored_options - ); + eprintln!("{}", ignored_options); } } @@ -210,7 +204,7 @@ impl CompilerConfig { let (options, maybe_ignored_options) = if config_str.is_empty() { (json!({}), None) } else { - tsc_config::parse_config(&config_str)? + tsc_config::parse_config(&config_str, &config_path)? }; // If `checkJs` is set to true in `compilerOptions` then we're gonna be compiling @@ -526,10 +520,7 @@ impl TsCompiler { tsc_config::json_merge(&mut compiler_options, &compiler_config.options); - warn_ignored_options( - compiler_config.maybe_ignored_options, - compiler_config.path.as_ref().unwrap(), - ); + warn_ignored_options(compiler_config.maybe_ignored_options); let j = json!({ "type": CompilerRequestType::Compile, @@ -646,10 +637,7 @@ impl TsCompiler { tsc_config::json_merge(&mut compiler_options, &compiler_config.options); - warn_ignored_options( - compiler_config.maybe_ignored_options, - compiler_config.path.as_ref().unwrap(), - ); + warn_ignored_options(compiler_config.maybe_ignored_options); let j = json!({ "type": CompilerRequestType::Bundle, |