diff options
Diffstat (limited to 'cli')
-rw-r--r-- | cli/Cargo.toml | 4 | ||||
-rw-r--r-- | cli/doc/class.rs | 1 | ||||
-rw-r--r-- | cli/fmt.rs | 2 | ||||
-rw-r--r-- | cli/lint.rs | 3 | ||||
-rw-r--r-- | cli/main.rs | 8 | ||||
-rw-r--r-- | cli/tsc.rs | 5 |
6 files changed, 13 insertions, 10 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml index b02f68825..78d29209b 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -20,7 +20,7 @@ deno_typescript = { path = "../deno_typescript", version = "0.48.3" } [dependencies] deno_core = { path = "../core", version = "0.48.3" } -deno_lint = "0.1.15" +deno_lint = "0.1.16" deno_typescript = { path = "../deno_typescript", version = "0.48.3" } atty = "0.2.14" @@ -30,7 +30,6 @@ byteorder = "1.3.4" clap = "2.33.1" dissimilar = "1.0.2" dlopen = "0.1.8" -dprint-plugin-typescript = "0.19.5" futures = { version = "0.3.5", features = ["compat", "io-compat"] } http = "0.2.1" idna = "0.2.0" @@ -61,7 +60,6 @@ walkdir = "2.3.1" warp = "0.2.3" semver-parser = "0.9.0" uuid = { version = "0.8.1", features = ["v4"] } -swc_ecma_visit = "0.7.0" [target.'cfg(windows)'.dependencies] winapi = { version = "0.3.8", features = ["knownfolders", "objbase", "shlobj", diff --git a/cli/doc/class.rs b/cli/doc/class.rs index bfcbfde71..af1964ac9 100644 --- a/cli/doc/class.rs +++ b/cli/doc/class.rs @@ -203,6 +203,7 @@ pub fn class_to_class_def( TsIndexSignature(_) => {} PrivateMethod(_) => {} PrivateProp(_) => {} + _ => {} } } diff --git a/cli/fmt.rs b/cli/fmt.rs index b41ef0d45..59239ec17 100644 --- a/cli/fmt.rs +++ b/cli/fmt.rs @@ -9,10 +9,10 @@ use crate::colors; use crate::diff::diff; +use crate::dprint_plugin_typescript as dprint; use crate::fs::files_in_subtree; use crate::op_error::OpError; use deno_core::ErrBox; -use dprint_plugin_typescript as dprint; use std::fs; use std::io::stdin; use std::io::stdout; diff --git a/cli/lint.rs b/cli/lint.rs index 766ebdcfa..e3e1a81ab 100644 --- a/cli/lint.rs +++ b/cli/lint.rs @@ -96,11 +96,12 @@ fn get_rules() -> Vec<Box<dyn LintRule>> { rules::no_explicit_any::NoExplicitAny::new(), rules::no_extra_boolean_cast::NoExtraBooleanCast::new(), rules::no_extra_non_null_assertion::NoExtraNonNullAssertion::new(), + rules::no_extra_semi::NoExtraSemi::new(), rules::no_func_assign::NoFuncAssign::new(), rules::no_misused_new::NoMisusedNew::new(), rules::no_namespace::NoNamespace::new(), rules::no_new_symbol::NoNewSymbol::new(), - rules::no_obj_call::NoObjCall::new(), + rules::no_obj_calls::NoObjCalls::new(), rules::no_octal::NoOctal::new(), rules::no_prototype_builtins::NoPrototypeBuiltins::new(), rules::no_regex_spaces::NoRegexSpaces::new(), diff --git a/cli/main.rs b/cli/main.rs index 5a40a0da2..9669d0938 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -66,9 +66,11 @@ pub mod version; mod web_worker; pub mod worker; -pub use dprint_plugin_typescript::swc_common; -pub use dprint_plugin_typescript::swc_ecma_ast; -pub use dprint_plugin_typescript::swc_ecma_parser; +pub use deno_lint::dprint_plugin_typescript; +pub use deno_lint::swc_common; +pub use deno_lint::swc_ecma_ast; +pub use deno_lint::swc_ecma_parser; +pub use deno_lint::swc_ecma_visit; use crate::doc::parser::DocFileLoader; use crate::file_fetcher::SourceFile; diff --git a/cli/tsc.rs b/cli/tsc.rs index 2a1307432..99b1449f8 100644 --- a/cli/tsc.rs +++ b/cli/tsc.rs @@ -21,6 +21,9 @@ use crate::state::State; use crate::swc_common::comments::CommentKind; use crate::swc_common::Span; use crate::swc_ecma_ast; +use crate::swc_ecma_visit; +use crate::swc_ecma_visit::Node; +use crate::swc_ecma_visit::Visit; use crate::swc_util::AstParser; use crate::swc_util::SwcDiagnosticBuffer; use crate::version; @@ -56,8 +59,6 @@ use std::sync::atomic::Ordering; use std::sync::Arc; use std::sync::Mutex; use std::task::Poll; -use swc_ecma_visit::Node; -use swc_ecma_visit::Visit; use url::Url; pub const AVAILABLE_LIBS: &[&str] = &[ |