replace filterByLanguage logic

codacy · Feb 26, 2024 · 3d9672c · 3d9672c
1 parent fc2379c
commit 3d9672c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/core/src/main/scala/com/codacy/analysis/core/files/FileCollector.scala b/core/src/main/scala/com/codacy/analysis/core/files/FileCollector.scala
@@ -87,7 +87,11 @@ trait FileCollector[T[_]] {
 
   private def filterByLanguage(language: Language, extensionsByLanguage: Map[Language, Set[String]])(
     files: Set[Path]): Set[Path] = {
-    Languages.filter(files.map(_.toString), Set(language), extensionsByLanguage).map(Paths.get(_))
+    val allExtensions =
+      extensionsByLanguage.getOrElse(language, Set.empty) ++
+        language.extensions ++ language.files
+
+    files.map(_.toString).filter(file => allExtensions.exists(e => file.endsWith(e))).map(Paths.get(_))
   }
 
   protected def checkPermissions(directory: File, files: Set[Path]): CheckedFiles = {

diff --git a/core/src/test/scala/com.codacy.analysis.core/files/FileCollectorSpec.scala b/core/src/test/scala/com.codacy.analysis.core/files/FileCollectorSpec.scala
@@ -331,7 +331,14 @@ abstract class FileCollectorSpec(fileCollector: FileCollector[Try]) extends Spec
     "src/main/resources/docs/directory-tests/rails3/app/models/user.rb",
     "src/main/resources/docs/directory-tests/rails3/app/helpers/other_helper.rb",
     "src/main/resources/docs/directory-tests/rails4/config/initializers/wrap_parameters.rb",
-    "src/main/resources/docs/directory-tests/rails4/config/initializers/session_store.rb")
+    "src/main/resources/docs/directory-tests/rails4/config/initializers/session_store.rb",
+    "src/main/resources/docs/directory-tests/rails4/config.ru",
+    "src/main/resources/docs/directory-tests/rails3/config.ru",
+    "src/main/resources/docs/directory-tests/rails3/Gemfile.lock",
+    "src/main/resources/docs/directory-tests/rails4/Gemfile",
+    "src/main/resources/docs/directory-tests/rails3/Rakefile",
+    "src/main/resources/docs/directory-tests/rails3/Gemfile",
+    "src/main/resources/docs/directory-tests/rails4/Rakefile")
 
   val expectedConfigFiles = List("src/main/resources/docs/directory-tests/rails3/config/brakeman.yml")