diff options
Diffstat (limited to 'cli/lsp')
| -rw-r--r-- | cli/lsp/config.rs | 4 | ||||
| -rw-r--r-- | cli/lsp/language_server.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs index 3c360b683..3fded336b 100644 --- a/cli/lsp/config.rs +++ b/cli/lsp/config.rs @@ -1232,7 +1232,7 @@ impl ConfigData { .and_then(|config_file| { config_file .to_fmt_config() - .and_then(|o| FmtOptions::resolve(o, &Default::default(), None)) + .map(|o| FmtOptions::resolve(o, &Default::default())) .inspect_err(|err| { lsp_warn!(" Couldn't read formatter configuration: {}", err) }) @@ -1260,7 +1260,7 @@ impl ConfigData { .and_then(|config_file| { config_file .to_lint_config() - .and_then(|o| LintOptions::resolve(o, Default::default(), None)) + .map(|o| LintOptions::resolve(o, &Default::default())) .inspect_err(|err| { lsp_warn!(" Couldn't read lint configuration: {}", err) }) diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index b3deef35b..093ea1dab 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -3557,7 +3557,7 @@ impl Inner { .unwrap_or_else(|| self.initial_cwd.clone()); // todo: we need a way to convert config data to a Workspace let workspace = Arc::new(Workspace::discover( - deno_config::workspace::WorkspaceDiscoverStart::Dirs(&[ + deno_config::workspace::WorkspaceDiscoverStart::Paths(&[ initial_cwd.clone() ]), &WorkspaceDiscoverOptions { |