Skip to content

fix(language_server): treat empty string config path as None in language server #17415

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
Dec 28, 2025
Merged

fix(language_server): treat empty string config path as None in language server #17415

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
27 changes: 23 additions & 4 deletions crates/oxc_language_server/src/linter/server_linter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ impl ServerLinterBuilder {
let mut nested_ignore_patterns = Vec::new();
let (nested_configs, mut extended_paths) =
Self::create_nested_configs(&root_path, &options, &mut nested_ignore_patterns);
let config_path = options.config_path.as_ref().map_or(LINT_CONFIG_FILE, |v| v);
let config_path = match options.config_path.as_deref() {
Some("") | None => LINT_CONFIG_FILE,
Some(v) => v,
};
let config = normalize_path(root_path.join(config_path));
let oxlintrc = if config.try_exists().is_ok_and(|exists| exists) {
if let Ok(oxlintrc) = Oxlintrc::from_file(&config) {
Expand Down Expand Up @@ -383,9 +386,11 @@ impl Tool for ServerLinter {
LSPLintOptions::default()
}
};
let mut watchers = vec![
options.config_path.as_ref().unwrap_or(&"**/.oxlintrc.json".to_string()).to_owned(),
];
let config_pattern = match options.config_path.as_deref() {
Some("") | None => "**/.oxlintrc.json".to_string(),
Some(v) => v.to_string(),
};
let mut watchers = vec![config_pattern];

for path in &self.extended_paths {
// ignore .oxlintrc.json files when using nested configs
Expand Down Expand Up @@ -820,6 +825,20 @@ mod test_watchers {
assert_eq!(patterns[0], "**/.oxlintrc.json".to_string());
}

#[test]
fn test_empty_string_config_path() {
let patterns = Tester::new(
"fixtures/linter/watchers/default",
json!({
"configPath": ""
}),
)
.get_watcher_patterns();

assert_eq!(patterns.len(), 1);
assert_eq!(patterns[0], "**/.oxlintrc.json".to_string());
}

#[test]
fn test_custom_config_path() {
let patterns = Tester::new(
Expand Down
Loading