summaryrefslogtreecommitdiff
path: root/cli/lsp
diff options
context:
space:
mode:
authorNayeem Rahman <nayeemrmn99@gmail.com>2024-11-18 21:45:34 +0000
committerGitHub <noreply@github.com>2024-11-18 21:45:34 +0000
commitc36f877f8d98f9756154e26809c614d6749b3fd1 (patch)
tree2ed76e8ce537a62efd4812a35c9cdf519abad29d /cli/lsp
parent19bbf83e47e4f98a45fe1c735dd2cdab80b99eca (diff)
fix(lsp): ignore editor indent settings if deno.json is present (#26912)
Diffstat (limited to 'cli/lsp')
-rw-r--r--cli/lsp/language_server.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
index c93628555..2ce26c1f2 100644
--- a/cli/lsp/language_server.rs
+++ b/cli/lsp/language_server.rs
@@ -1396,9 +1396,11 @@ impl Inner {
.fmt_config_for_specifier(&specifier)
.options
.clone();
- fmt_options.use_tabs = Some(!params.options.insert_spaces);
- fmt_options.indent_width = Some(params.options.tab_size as u8);
let config_data = self.config.tree.data_for_specifier(&specifier);
+ if !config_data.is_some_and(|d| d.maybe_deno_json().is_some()) {
+ fmt_options.use_tabs = Some(!params.options.insert_spaces);
+ fmt_options.indent_width = Some(params.options.tab_size as u8);
+ }
let unstable_options = UnstableFmtOptions {
component: config_data
.map(|d| d.unstable.contains("fmt-component"))