4 files changed, 12 insertions, 16 deletions
diff --git a/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/ChangedFilePredicate.java b/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/ChangedFilePredicate.java
index 7e981e82f77..c3c38969ce4 100644
--- a/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/ChangedFilePredicate.java
+++ b/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/ChangedFilePredicate.java
@@ -24,15 +24,9 @@ import org.sonar.api.batch.fs.InputFile;
 
 public class ChangedFilePredicate implements FilePredicate {
 
-  private final FilePredicate originalPredicate;
-
-  public ChangedFilePredicate(FilePredicate originalPredicate) {
-    this.originalPredicate = originalPredicate;
-  }
-
   @Override
   public boolean apply(InputFile inputFile) {
-    return originalPredicate.apply(inputFile) && InputFile.Status.SAME != inputFile.status();
+    return InputFile.Status.SAME != inputFile.status();
   }
 
 }
diff --git a/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/FileExtensionPredicate.java b/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/FileExtensionPredicate.java
index 29e387b97b2..91ca9258621 100644
--- a/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/FileExtensionPredicate.java
+++ b/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/FileExtensionPredicate.java
@@ -59,4 +59,9 @@ public class FileExtensionPredicate extends AbstractFilePredicate {
   private static String lowercase(String extension) {
     return extension.toLowerCase(Locale.ENGLISH);
   }
+
+  @Override
+  public int priority() {
+    return USE_INDEX;
+  }
 }
diff --git a/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/FilenamePredicate.java b/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/FilenamePredicate.java
index 39856a3583e..a32f3c88cb9 100644
--- a/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/FilenamePredicate.java
+++ b/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/FilenamePredicate.java
@@ -42,4 +42,8 @@ public class FilenamePredicate extends AbstractFilePredicate {
     return index.getFilesByName(filename);
   }
 
+  @Override
+  public int priority() {
+    return USE_INDEX;
+  }
 }
diff --git a/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/HiddenFilesPredicate.java b/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/NonHiddenFilesPredicate.java
index ab166cd0bbd..4b467e6dba5 100644
--- a/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/HiddenFilesPredicate.java
+++ b/sonar-plugin-api-impl/src/main/java/org/sonar/api/batch/fs/internal/predicates/NonHiddenFilesPredicate.java
@@ -22,18 +22,11 @@ package org.sonar.api.batch.fs.internal.predicates;
 import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.InputFile;
 
-public class HiddenFilesPredicate implements FilePredicate {
-
-  private final FilePredicate originalPredicate;
-
-  public HiddenFilesPredicate(FilePredicate originalPredicate) {
-    this.originalPredicate = originalPredicate;
-  }
+public class NonHiddenFilesPredicate implements FilePredicate {
 
   @Override
   public boolean apply(InputFile inputFile) {
-    // isHidden() will be known during scanning, evaluation should be done before other predicates
-    return !inputFile.isHidden() && originalPredicate.apply(inputFile);
+    return !inputFile.isHidden();
   }
 
 }