diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2024-09-28 19:17:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-28 19:17:48 -0400 |
| commit | 5faf769ac61b627d14710cdf487de7cd4eb3f9d3 (patch) | |
| tree | 2cc4ab975522b3c8845ab3040c010fd998a769a6 /cli/lsp/config.rs | |
| parent | 3138478f66823348eb745c7f0c2d34eed378a3f0 (diff) | |
refactor: extract out sloppy imports resolution from CLI crate (#25920)
This is slow progress towards creating a `deno_resolver` crate.
Waiting on:
* https://github.com/denoland/deno/pull/25918
* https://github.com/denoland/deno/pull/25916
Diffstat (limited to 'cli/lsp/config.rs')
| -rw-r--r-- | cli/lsp/config.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs index dcb6120a4..c54de3a23 100644 --- a/cli/lsp/config.rs +++ b/cli/lsp/config.rs @@ -59,7 +59,8 @@ use crate::args::LintOptions; use crate::cache::FastInsecureHasher; use crate::file_fetcher::FileFetcher; use crate::lsp::logging::lsp_warn; -use crate::resolver::SloppyImportsResolver; +use crate::resolver::CliSloppyImportsResolver; +use crate::resolver::SloppyImportsCachedFs; use crate::tools::lint::CliLinter; use crate::tools::lint::CliLinterOptions; use crate::tools::lint::LintRuleProvider; @@ -1181,7 +1182,7 @@ pub struct ConfigData { pub lockfile: Option<Arc<CliLockfile>>, pub npmrc: Option<Arc<ResolvedNpmRc>>, pub resolver: Arc<WorkspaceResolver>, - pub sloppy_imports_resolver: Option<Arc<SloppyImportsResolver>>, + pub sloppy_imports_resolver: Option<Arc<CliSloppyImportsResolver>>, pub import_map_from_settings: Option<ModuleSpecifier>, watched_files: HashMap<ModuleSpecifier, ConfigWatchedFileType>, } @@ -1584,9 +1585,11 @@ impl ConfigData { .is_ok() || member_dir.workspace.has_unstable("sloppy-imports"); let sloppy_imports_resolver = unstable_sloppy_imports.then(|| { - Arc::new(SloppyImportsResolver::new_without_stat_cache(Arc::new( - deno_runtime::deno_fs::RealFs, - ))) + Arc::new(CliSloppyImportsResolver::new( + SloppyImportsCachedFs::new_without_stat_cache(Arc::new( + deno_runtime::deno_fs::RealFs, + )), + )) }); let resolver = Arc::new(resolver); let lint_rule_provider = LintRuleProvider::new( |