Skip to content

fix(language_server): start from a default oxlint configuration + SafeFix for nested configuration #10043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Mar 26, 2025
Merged

fix(language_server): start from a default oxlint configuration + SafeFix for nested configuration #10043

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions crates/oxc_language_server/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,25 +552,23 @@ impl Backend {
Oxlintrc::default()
};

let config_store = ConfigStoreBuilder::from_oxlintrc(true, oxlintrc.clone())
let config_store = ConfigStoreBuilder::from_oxlintrc(false, oxlintrc.clone())
.expect("failed to build config")
.build()
.expect("failed to build config");

let lint_options = LintOptions { fix: FixKind::SafeFix, ..Default::default() };

let linter = if self.options.lock().await.disable_nested_configs() {
Linter::new(LintOptions::default(), config_store).with_fix(FixKind::SafeFix)
Linter::new(lint_options, config_store)
} else {
let nested_configs = self.nested_configs.pin();
let nested_configs_copy: FxHashMap<PathBuf, ConfigStore> = nested_configs
.iter()
.map(|(key, value)| (key.clone(), value.clone()))
.collect::<FxHashMap<_, _>>();

Linter::new_with_nested_configs(
LintOptions::default(),
config_store,
nested_configs_copy,
)
Linter::new_with_nested_configs(lint_options, config_store, nested_configs_copy)
};

*self.server_linter.write().await = ServerLinter::new_with_linter(linter);
Expand Down