fix(project): correctly ignore folders

biomejs · Mar 21, 2024 · 0561c94 · 0561c94
1 parent 9e0a308
commit 0561c94
Show file tree

Hide file tree

Showing 9 changed files with 234 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,10 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
 ### CLI
 
+#### Bug fixes
+
+- Fixes [#2131](https://github.com/biomejs/biome/issues/2131), where folders were incorrectly ignored when running the command `check`. Now folders are correctly ignored based on their command. Contributed by @ematipico
+
 ### Configuration
 
 #### Bug fixes

diff --git a/crates/biome_cli/src/execute/mod.rs b/crates/biome_cli/src/execute/mod.rs
@@ -30,19 +30,14 @@ pub(crate) struct Execution {
 impl Execution {
     pub(crate) fn to_features(&self) -> Vec<FeatureName> {
         match self.traversal_mode {
-            TraversalMode::Format { .. } => FeaturesBuilder::new()
-                .with_formatter()
-                .build(),
-            TraversalMode::Lint { ..} => FeaturesBuilder::new()
-                .with_linter()
-                .build(),
+            TraversalMode::Format { .. } => FeaturesBuilder::new().with_formatter().build(),
+            TraversalMode::Lint { .. } => FeaturesBuilder::new().with_linter().build(),
             TraversalMode::Check { .. } | TraversalMode::CI { .. } => FeaturesBuilder::new()
                 .with_organize_imports()
                 .with_formatter()
                 .with_linter()
                 .build(),
-            TraversalMode::Migrate { .. } => vec![]
-
+            TraversalMode::Migrate { .. } => vec![],
         }
     }
 }

diff --git a/crates/biome_cli/src/execute/traverse.rs b/crates/biome_cli/src/execute/traverse.rs
@@ -13,7 +13,7 @@ use biome_diagnostics::PrintGitHubDiagnostic;
 use biome_diagnostics::{category, DiagnosticExt, Error, PrintDiagnostic, Resource, Severity};
 use biome_fs::{BiomePath, FileSystem, PathInterner};
 use biome_fs::{TraversalContext, TraversalScope};
-use biome_service::workspace::{FeaturesBuilder, IsPathIgnoredParams};
+use biome_service::workspace::IsPathIgnoredParams;
 use biome_service::{extension_error, workspace::SupportsFeatureParams, Workspace, WorkspaceError};
 use crossbeam::channel::{unbounded, Receiver, Sender};
 use rustc_hash::FxHashSet;
@@ -713,11 +713,7 @@ impl<'ctx, 'app> TraversalContext for TraversalOptions<'ctx, 'app> {
 
         let file_features = self.workspace.file_features(SupportsFeatureParams {
             path: biome_path.clone(),
-            feature: FeaturesBuilder::new()
-                .with_linter()
-                .with_formatter()
-                .with_organize_imports()
-                .build(),
+            feature: self.execution.to_features(),
         });
 
         let file_features = match file_features {

diff --git a/crates/biome_cli/tests/commands/check.rs b/crates/biome_cli/tests/commands/check.rs
@@ -2797,3 +2797,52 @@ fn use_literal_keys_should_emit_correct_ast_issue_266() {
         result,
     ));
 }
+
+#[test]
+fn should_show_diagnostics_for_linter_ignored_file_when_folder_is_ignored() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
+    let file_path = Path::new("build/file.js");
+    fs.insert(
+        file_path.into(),
+        r#"
+	value['optimizelyService'] = optimizelyService;
+		"#,
+    );
+
+    let biome_json = Path::new("biome.json");
+    fs.insert(
+        biome_json.into(),
+        r#"{
+    "$schema": "https://biomejs.dev/schemas/1.6.1/schema.json",
+    "organizeImports": {
+        "enabled": true
+    },
+    "linter": {
+        "ignore": ["**/build"],
+        "enabled": true,
+        "rules": {
+            "recommended": true
+        }
+    }
+}
+        "#,
+    );
+
+    let result = run_cli(
+        DynRef::Borrowed(&mut fs),
+        &mut console,
+        Args::from([("check"), file_path.as_os_str().to_str().unwrap()].as_slice()),
+    );
+
+    assert!(result.is_err(), "run_cli returned {result:?}");
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "should_show_diagnostics_for_linter_ignored_file_when_folder_is_ignored",
+        fs,
+        console,
+        result,
+    ));
+}
diff --git a/crates/biome_cli/tests/commands/format.rs b/crates/biome_cli/tests/commands/format.rs
@@ -3461,3 +3461,59 @@ fn format_empty_svelte_ts_files_write() {
         result,
     ));
 }
+
+#[test]
+fn should_fix_file_ignored_by_linter_inside_folder() {
+    let mut fs = MemoryFileSystem::default();
+    let mut console = BufferConsole::default();
+
+    let file_path = Path::new("build/file.js");
+    fs.insert(
+        file_path.into(),
+        r#"
+	value['optimizelyService'] = optimizelyService;
+		"#,
+    );
+
+    let biome_json = Path::new("biome.json");
+    fs.insert(
+        biome_json.into(),
+        r#"{
+    "$schema": "https://biomejs.dev/schemas/1.6.1/schema.json",
+    "organizeImports": {
+        "enabled": true
+    },
+    "linter": {
+        "ignore": ["**/build"],
+        "enabled": true,
+        "rules": {
+            "recommended": true
+        }
+    }
+}
+        "#,
+    );
+
+    let result = run_cli(
+        DynRef::Borrowed(&mut fs),
+        &mut console,
+        Args::from(
+            [
+                ("format"),
+                "--write",
+                file_path.as_os_str().to_str().unwrap(),
+            ]
+            .as_slice(),
+        ),
+    );
+
+    assert!(result.is_ok(), "run_cli returned {result:?}");
+
+    assert_cli_snapshot(SnapshotPayload::new(
+        module_path!(),
+        "should_fix_file_ignored_by_linter_inside_folder",
+        fs,
+        console,
+        result,
+    ));
+}
diff --git a/...ommands_check/should_show_diagnostics_for_linter_ignored_file_when_folder_is_ignored.snap b/...ommands_check/should_show_diagnostics_for_linter_ignored_file_when_folder_is_ignored.snap
@@ -0,0 +1,80 @@
+---
+source: crates/biome_cli/tests/snap_test.rs
+expression: content
+---
+## `biome.json`
+
+```json
+{
+  "$schema": "https://biomejs.dev/schemas/1.6.1/schema.json",
+  "organizeImports": {
+    "enabled": true
+  },
+  "linter": {
+    "ignore": ["**/build"],
+    "enabled": true,
+    "rules": {
+      "recommended": true
+    }
+  }
+}
+```
+
+## `build/file.js`
+
+```js
+
+	value['optimizelyService'] = optimizelyService;
+
+```
+
+# Termination Message
+
+```block
+check ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × Some errors were emitted while running checks.
+  
+
+
+```
+
+# Emitted Messages
+
+```block
+build/file.js:2:8 lint/complexity/useLiteralKeys  FIXABLE  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × The computed expression can be simplified without the use of a string literal.
+  
+  > 2 │ 	value['optimizelyService'] = optimizelyService;
+      │ 	      ^^^^^^^^^^^^^^^^^^^
+    3 │ 		
+  
+  i Unsafe fix: Use a literal key instead.
+  
+    1 1 │   
+    2   │ - → value['optimizelyService']·=·optimizelyService;
+      2 │ + → value.optimizelyService·=·optimizelyService;
+    3 3 │   		
+  
+
+```
+
+```block
+build/file.js format ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  i Formatter would have printed the following content:
+  
+    1   │ - 
+    2   │ - → value['optimizelyService']·=·optimizelyService;
+    3   │ - → → 
+      1 │ + value["optimizelyService"]·=·optimizelyService;
+      2 │ + 
+  
+
+```
+
+```block
+Checked 1 file in <TIME>. No fixes needed.
+Found 4 errors.
+```
diff --git a/...tests/snapshots/main_commands_format/should_fix_file_ignored_by_linter_inside_folder.snap b/...tests/snapshots/main_commands_format/should_fix_file_ignored_by_linter_inside_folder.snap
@@ -0,0 +1,34 @@
+---
+source: crates/biome_cli/tests/snap_test.rs
+expression: content
+---
+## `biome.json`
+
+```json
+{
+  "$schema": "https://biomejs.dev/schemas/1.6.1/schema.json",
+  "organizeImports": {
+    "enabled": true
+  },
+  "linter": {
+    "ignore": ["**/build"],
+    "enabled": true,
+    "rules": {
+      "recommended": true
+    }
+  }
+}
+```
+
+## `build/file.js`
+
+```js
+value["optimizelyService"] = optimizelyService;
+
+```
+
+# Emitted Messages
+
+```block
+Formatted 1 file in <TIME>. Fixed 1 file.
+```
diff --git a/crates/biome_service/src/workspace/server.rs b/crates/biome_service/src/workspace/server.rs
@@ -246,10 +246,10 @@ impl WorkspaceServer {
     fn is_ignored(&self, path: &Path, features: Vec<FeatureName>) -> bool {
         let file_name = path.file_name().and_then(|s| s.to_str());
         let ignored_by_features = {
-          let mut ignored = false;
+            let mut ignored = false;
             for feature in features {
                 // a path is ignored if it's ignored by all features
-               ignored &= self.is_ignored_by_feature_config(path, feature)
+                ignored &= self.is_ignored_by_feature_config(path, feature)
             }
             ignored
         };

diff --git a/website/src/content/docs/internals/changelog.md b/website/src/content/docs/internals/changelog.md
@@ -27,6 +27,10 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
 ### CLI
 
+#### Bug fixes
+
+- Fixes [#2131](https://github.com/biomejs/biome/issues/2131), where folders were incorrectly ignored when running the command `check`. Now folders are correctly ignored based on their command. Contributed by @ematipico
+
 ### Configuration
 
 #### Bug fixes