fix(core): scanner ignores files inside VCS #6839

ematipico · 2025-07-11T07:43:48Z

Summary

Closes #6838
Closes #6797
Closes #6784

This PR fixes a bug where the scanner didn't ignore files that are declared inside the root ignore files.

While it doesn't cover all cases, with this fix we give to the root ignore file the same capabilities and semantics as files. includes.

This PR also fixes a bug where the language server didn't correctly ignore certain files when using the VCS integration, and inside the root ignore file there were globs like dist/.

Test Plan

I did some manual testing. I also added a couple of tests.

Docs

biomejs/website#2679

changeset-bot · 2025-07-11T07:43:53Z

🦋 Changeset detected

Latest commit: 26c9791

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 13 packages

Name	Type
@biomejs/biome	Patch
@biomejs/cli-win32-x64	Patch
@biomejs/cli-win32-arm64	Patch
@biomejs/cli-darwin-x64	Patch
@biomejs/cli-darwin-arm64	Patch
@biomejs/cli-linux-x64	Patch
@biomejs/cli-linux-arm64	Patch
@biomejs/cli-linux-x64-musl	Patch
@biomejs/cli-linux-arm64-musl	Patch
@biomejs/wasm-web	Patch
@biomejs/wasm-bundler	Patch
@biomejs/wasm-nodejs	Patch
@biomejs/backend-jsonrpc	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

arendjr

If I understand correctly, your fixes are based on correctly storing the root settings, but the logic for checking ignore files didn't actually change? It seems then that is_root_ignored() can indeed be safely removed, because I don't see it being used right now.

Regarding the test, I think it would be good to add a case watcher.tests.rs. There's already a few tests there that you can draw inspiration from, and you can use it to create one that shows that a watcher notification doesn't result in an ignored file getting opened. And then it would probably be good to add a second one to show that a non-ignored file does get opened, because such a test seems to be missing still, but we would need one for contrast.

.changeset/green-banks-feel.md

crates/biome_service/src/diagnostics.rs

crates/biome_service/src/settings.rs

crates/biome_service/src/workspace/server.rs

crates/biome_service/src/settings.rs

ematipico · 2025-07-12T08:52:07Z

PR description updated. Code updated and changesets added.

.changeset/crazy-words-sink.md

Co-authored-by: Arend van Beelen jr. <arend@arendjr.nl>

ematipico · 2025-07-14T07:09:17Z

If I understand correctly, your fixes are based on correctly storing the root settings, but the logic for checking ignore files didn't actually change? It seems then that is_root_ignored() can indeed be safely removed, because I don't see it being used right now.

Now that the code is updated, yes, the PR also fixes the logic that checks if a file is ignored. When we have glob like dist/ inside .gitinogre, and we open a file inside the dist/ folder, that file wasn't ignored and I could see diagnostics.

That's because dist/ doesn't match dist/file.js. Not sure if this is a bug in the library. I assume it's not. This means that I had to come up with a workaround: we crawl upward the path until we reach the working directory. If there's a match, the file is ignored.

arendjr

Did we add tests for all issues? With so many issues solved in one PR it's become a bit hard to track which parts are related to which issue.

Nevertheless I'm very happy with these improvements, but we need to exclude the upwards matching for the scanner use case.

.changeset/weak-readers-march.md

crates/biome_service/src/projects.rs

crates/biome_service/src/settings.rs

crates/biome_service/src/projects.rs

Co-authored-by: Arend van Beelen jr. <arend@arendjr.nl>

ematipico · 2025-07-14T12:13:19Z

@arendjr please review the PR. I applied your suggestions, but they didn't reach the Workspace level, which is good.. I also added more tests.

crates/biome_service/src/settings.rs

crates/biome_service/src/projects.rs

ematipico · 2025-07-14T17:16:20Z

Tested locally again, and I can see now regressions or CPU/RAM peaks

arendjr · 2025-07-14T18:10:44Z

@ematipico I see, the watcher is now calling is_ignored_by_scanner(). I thought that method contained the business logic of checking which files are ignored by the scanner (as the name implies), but really it's only checking which files are explicitly ignored through the experimentalScannerIgnores. The full logic of which files are handled by the scanner is in scanner.rs, in the can_handle() method. I don't mind moving that logic in its entirety to the is_ignored_by_scanner() method (be careful, you need to inverse it of course). But then I think the logic still needs to be extended with the ignore_kind as well.

arendjr

🥳

ematipico mentioned this pull request Jul 11, 2025

fix: ignore file capabilities biomejs/website#2679

Merged

github-actions bot added A-CLI Area: CLI A-Project Area: project labels Jul 11, 2025

arendjr reviewed Jul 11, 2025

View reviewed changes

ematipico mentioned this pull request Jul 11, 2025

🐛 Memory leak in biome.exe #6784

Closed

3 tasks

arendjr mentioned this pull request Jul 11, 2025

refactor: make Watcher aware of ScanKind #6842

Merged

ematipico force-pushed the fix/ignore-files-scanner branch from 8a74742 to 3801596 Compare July 12, 2025 08:50

ematipico requested review from a team July 12, 2025 08:52

ematipico force-pushed the fix/ignore-files-scanner branch 2 times, most recently from c6f3a3f to d6127ee Compare July 12, 2025 08:55

ematipico requested a review from arendjr July 12, 2025 09:00

ematipico commented Jul 12, 2025

View reviewed changes

.changeset/crazy-words-sink.md Outdated Show resolved Hide resolved

ematipico and others added 6 commits July 14, 2025 09:04

fix(core): scanner ignores files inside VCS

212b473

Update crates/biome_service/src/settings.rs

17f3cb3

Co-authored-by: Arend van Beelen jr. <arend@arendjr.nl>

Update .changeset/green-banks-feel.md

0e0ce86

Co-authored-by: Arend van Beelen jr. <arend@arendjr.nl>

chore: watcher tests

d63ee2d

chore: address more use cases

5b7cfd2

Apply suggestions from code review

1ebcf99

ematipico force-pushed the fix/ignore-files-scanner branch from a6874f9 to 1ebcf99 Compare July 14, 2025 07:05

arendjr requested changes Jul 14, 2025

View reviewed changes

chore: apply feedback, add more tests

7e977df

github-actions bot added A-Core Area: core A-LSP Area: language server protocol labels Jul 14, 2025

ematipico and others added 3 commits July 14, 2025 13:59

revert plugins error

01f5165

opsie

940fe79

Update .changeset/weak-readers-march.md

b51aa13

Co-authored-by: Arend van Beelen jr. <arend@arendjr.nl>

ematipico requested a review from arendjr July 14, 2025 12:12

arendjr reviewed Jul 14, 2025

View reviewed changes

crates/biome_service/src/settings.rs Outdated Show resolved Hide resolved

crates/biome_service/src/projects.rs Outdated Show resolved Hide resolved

ematipico requested a review from arendjr July 14, 2025 17:16

refactor to workspace level

bc87585

ematipico force-pushed the fix/ignore-files-scanner branch from ffb3c9f to bc87585 Compare July 15, 2025 13:15

ematipico requested a review from a team July 15, 2025 13:15

ematipico marked this pull request as draft July 15, 2025 13:19

fix regression

26c9791

ematipico marked this pull request as ready for review July 15, 2025 13:29

arendjr approved these changes Jul 15, 2025

View reviewed changes

ematipico merged commit 4cd62d8 into main Jul 15, 2025
12 checks passed

ematipico deleted the fix/ignore-files-scanner branch July 15, 2025 13:59

github-actions bot mentioned this pull request Jul 15, 2025

ci: release #6807

Merged

siketyan mentioned this pull request Jul 26, 2025

🐛 Subdirectory .gitignore files incorrectly applied globally #6811

Closed

1 task

Uh oh!

fix(core): scanner ignores files inside VCS #6839

fix(core): scanner ignores files inside VCS #6839

Uh oh!

Conversation

ematipico commented Jul 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test Plan

Docs

Uh oh!

changeset-bot bot commented Jul 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

arendjr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ematipico commented Jul 12, 2025

Uh oh!

Uh oh!

ematipico commented Jul 14, 2025

Uh oh!

arendjr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ematipico commented Jul 14, 2025

Uh oh!

Uh oh!

Uh oh!

ematipico commented Jul 14, 2025

Uh oh!

arendjr commented Jul 14, 2025

Uh oh!

arendjr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

ematipico commented Jul 11, 2025 •

edited

Loading

changeset-bot bot commented Jul 11, 2025 •

edited

Loading