diff options
Diffstat (limited to 'cli/tools/lint/rules')
-rw-r--r-- | cli/tools/lint/rules/mod.rs | 6 | ||||
-rw-r--r-- | cli/tools/lint/rules/no_sloppy_imports.rs | 19 |
2 files changed, 16 insertions, 9 deletions
diff --git a/cli/tools/lint/rules/mod.rs b/cli/tools/lint/rules/mod.rs index 2669ffda1..dd723ad15 100644 --- a/cli/tools/lint/rules/mod.rs +++ b/cli/tools/lint/rules/mod.rs @@ -14,7 +14,7 @@ use deno_graph::ModuleGraph; use deno_lint::diagnostic::LintDiagnostic; use deno_lint::rules::LintRule; -use crate::resolver::SloppyImportsResolver; +use crate::resolver::CliSloppyImportsResolver; mod no_sloppy_imports; mod no_slow_types; @@ -144,13 +144,13 @@ impl ConfiguredRules { } pub struct LintRuleProvider { - sloppy_imports_resolver: Option<Arc<SloppyImportsResolver>>, + sloppy_imports_resolver: Option<Arc<CliSloppyImportsResolver>>, workspace_resolver: Option<Arc<WorkspaceResolver>>, } impl LintRuleProvider { pub fn new( - sloppy_imports_resolver: Option<Arc<SloppyImportsResolver>>, + sloppy_imports_resolver: Option<Arc<CliSloppyImportsResolver>>, workspace_resolver: Option<Arc<WorkspaceResolver>>, ) -> Self { Self { diff --git a/cli/tools/lint/rules/no_sloppy_imports.rs b/cli/tools/lint/rules/no_sloppy_imports.rs index 4180be5be..2f6087588 100644 --- a/cli/tools/lint/rules/no_sloppy_imports.rs +++ b/cli/tools/lint/rules/no_sloppy_imports.rs @@ -16,24 +16,25 @@ use deno_lint::diagnostic::LintDiagnosticRange; use deno_lint::diagnostic::LintFix; use deno_lint::diagnostic::LintFixChange; use deno_lint::rules::LintRule; +use deno_resolver::sloppy_imports::SloppyImportsResolution; +use deno_resolver::sloppy_imports::SloppyImportsResolutionMode; use text_lines::LineAndColumnIndex; use crate::graph_util::CliJsrUrlProvider; -use crate::resolver::SloppyImportsResolution; -use crate::resolver::SloppyImportsResolver; +use crate::resolver::CliSloppyImportsResolver; use super::ExtendedLintRule; #[derive(Debug)] pub struct NoSloppyImportsRule { - sloppy_imports_resolver: Option<Arc<SloppyImportsResolver>>, + sloppy_imports_resolver: Option<Arc<CliSloppyImportsResolver>>, // None for making printing out the lint rules easy workspace_resolver: Option<Arc<WorkspaceResolver>>, } impl NoSloppyImportsRule { pub fn new( - sloppy_imports_resolver: Option<Arc<SloppyImportsResolver>>, + sloppy_imports_resolver: Option<Arc<CliSloppyImportsResolver>>, workspace_resolver: Option<Arc<WorkspaceResolver>>, ) -> Self { NoSloppyImportsRule { @@ -172,7 +173,7 @@ impl LintRule for NoSloppyImportsRule { #[derive(Debug)] struct SloppyImportCaptureResolver<'a> { workspace_resolver: &'a WorkspaceResolver, - sloppy_imports_resolver: &'a SloppyImportsResolver, + sloppy_imports_resolver: &'a CliSloppyImportsResolver, captures: RefCell<HashMap<Range, SloppyImportsResolution>>, } @@ -194,7 +195,13 @@ impl<'a> deno_graph::source::Resolver for SloppyImportCaptureResolver<'a> { } | deno_config::workspace::MappedResolution::ImportMap { specifier, .. - } => match self.sloppy_imports_resolver.resolve(&specifier, mode) { + } => match self.sloppy_imports_resolver.resolve( + &specifier, + match mode { + ResolutionMode::Execution => SloppyImportsResolutionMode::Execution, + ResolutionMode::Types => SloppyImportsResolutionMode::Types, + }, + ) { Some(res) => { self .captures |