Skip to content

refactor(oxc_language_server): remove unnecessary globset #12861

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
merged 1 commit into from
Aug 7, 2025
Merged

refactor(oxc_language_server): remove unnecessary globset #12861

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/oxc_language_server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ oxc_linter = { workspace = true, features = ["language_server"] }
#
env_logger = { workspace = true, features = ["humantime"] }
futures = { workspace = true }
globset = { workspace = true }
ignore = { workspace = true, features = ["simd-accel"] }
log = { workspace = true }
papaya = { workspace = true }
Expand Down
19 changes: 9 additions & 10 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
@@ -1,7 +1,6 @@
use std::path::{Component, Path, PathBuf};
use std::sync::Arc;

use globset::Glob;
use ignore::gitignore::Gitignore;
use log::{debug, warn};
use rustc_hash::{FxBuildHasher, FxHashMap};
Expand Down Expand Up @@ -164,14 +163,8 @@ impl ServerLinter {
(nested_configs, extended_paths)
}

#[expect(clippy::filetype_is_file)]
fn create_ignore_glob(root_path: &Path, oxlintrc: &Oxlintrc) -> Vec<Gitignore> {
let mut builder = globset::GlobSetBuilder::new();
// Collecting all ignore files
builder.add(Glob::new("**/.eslintignore").unwrap());
builder.add(Glob::new("**/.gitignore").unwrap());

let ignore_file_glob_set = builder.build().unwrap();

let walk = ignore::WalkBuilder::new(root_path)
.ignore(true)
.hidden(false)
Expand All @@ -181,11 +174,17 @@ impl ServerLinter {

let mut gitignore_globs = vec![];
for entry in walk {
if !entry.file_type().is_some_and(|v| v.is_file()) {
continue;
}
let ignore_file_path = entry.path();
if !ignore_file_glob_set.is_match(ignore_file_path) {
if !ignore_file_path
.file_name()
.and_then(std::ffi::OsStr::to_str)
.is_some_and(|v| [".eslintignore", ".gitignore"].contains(&v))
{
continue;
}

if let Some(ignore_file_dir) = ignore_file_path.parent() {
let mut builder = ignore::gitignore::GitignoreBuilder::new(ignore_file_dir);
builder.add(ignore_file_path);
Expand Down
Loading