Add version specific code

Author: lolgab

.circleci/config.yml

@@ -33,8 +33,8 @@ references:
   restore_build: &restore_build
     restore_cache:
       keys:
-        - sbt-build-1.0.0-{{ .Branch }}-{{ .Revision }}
-        - sbt-build-1.0.0
+        - sbt-build-1.0.1-{{ .Branch }}-{{ .Revision }}
+        - sbt-build-1.0.1
 
   setup_dependencies_key: &setup_dependencies_key
     run:
@@ -69,6 +69,7 @@ jobs:
           paths:
             - ~/.ivy2
             - ~/.sbt
+            - ~/.coursier/cache/v1
           key: sbt-ivy2-dependencies-1.0.0-{{ checksum "/tmp/dependencies.cache.tmp" }}
 
   compile:
@@ -102,15 +103,15 @@ jobs:
           working_directory: ~/
           command: |
             mkdir -p ~/coverage-reports/scoverage
-            cp -f ~/workdir/target/scala-2.11/coverage-report/cobertura.xml ~/coverage-reports/scoverage/results.xml
+            cp -f ~/workdir/target/scala-2.12/coverage-report/cobertura.xml ~/coverage-reports/scoverage/results.xml
       - store_test_results:
           path: ~/coverage-reports
       - store_artifacts:
-          path: ~/workdir/target/scala-2.11/coverage-report
+          path: ~/workdir/target/scala-2.12/coverage-report
       - store_artifacts:
-          path: ~/workdir/target/scala-2.11/scoverage-report
+          path: ~/workdir/target/scala-2.12/scoverage-report
       - store_artifacts:
-          path: ~/workdir/target/scala-2.11/scoverage-data
+          path: ~/workdir/target/scala-2.12/scoverage-data
 
   publish:
     <<: *default_java_job

.scalafmt.conf

@@ -1,3 +1,4 @@
+version = "2.0.1"
 style=IntelliJ
 project.excludeFilters = [".*\\.scala.html$", "components/pluginsEngineComponent/src/test/resources/.*", "target/.*"]
 maxColumn=120

build.sbt

@@ -9,10 +9,17 @@ scalaVersion := scala212
 crossScalaVersions := Seq(scala211, scala212, scala213)
 
 libraryDependencies ++= Seq(
-  "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.2",
   "org.specs2" %% "specs2-core" % "4.6.0" % Test
 )
 
+unmanagedSourceDirectories in Compile += {
+  val sourceDir = (sourceDirectory in Compile).value
+  CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, n)) if n >= 13 => sourceDir / "scala-2.13+"
+    case _                       => sourceDir / "scala-2.13-"
+  }
+}
+
 // Sonatype repository settings
 ThisBuild / credentials += Credentials(
   "Sonatype Nexus Repository Manager",

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.0

project/plugins.sbt

@@ -1,5 +1,3 @@
-import sbt._
-
 // Sonatype publishing
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")

scripts/test.sh

@@ -6,12 +6,12 @@ if [ -n "$1" ]; then
     export CODACY_PROJECT_TOKEN="$1"
 fi
 
-sbt +coverage +test
-sbt +coverageReport
-sbt +coverageAggregate
+sbt coverage +test
+sbt coverageReport
+sbt coverageAggregate
 
 if [ -z "$CODACY_PROJECT_TOKEN" ]; then
     echo "CODACY_PROJECT_TOKEN not found. Skipping send coverage to Codacy."
 else
-    sbt +codacyCoverage
+    sbt codacyCoverage
 fi

src/main/scala-2.13+/com/codacy/plugins/api/languages/LanguageImpl.scala

@@ -0,0 +1,51 @@
+package com.codacy.plugins.api.languages
+
+import Languages._
+
+private[languages] object LanguagesImpl {
+  def extensionsByLanguageImpl: Map[Language, Set[String]] =
+    all.view.map { lang =>
+      (lang, lang.extensions)
+    }.to(Map)
+
+  def filenamesByLanguageImpl: Map[Language, Set[String]] =
+    all.view.map { lang =>
+      (lang, lang.files)
+    }.to(Map)
+
+  def languageByExtensionImpl: Map[String, Language] =
+    all.view.flatMap { lang =>
+      lang.extensions.map(extension => (extension.toLowerCase(), lang))
+    }.to(Map)
+
+  def languageByFilenameImpl: Map[String, Language] =
+    all.view.flatMap { lang =>
+      lang.files.map(file => (file.toLowerCase(), lang))
+    }.to(Map)
+
+  def forPathImpl(
+    filePath: String,
+    customExtensions: List[(Language, Seq[String])] = List.empty[(Language, Seq[String])]): Option[Language] = {
+    lazy val languageByCustomExtension: List[(String, Language)] = {
+      val customExtensionsMap: Map[Language, Set[String]] = customExtensions.view.map {
+        case (lang, exts) =>
+          (lang, exts.view.to(Set) ++ extensionsByLanguage.getOrElse(lang, Set.empty))
+      }.to(Map)
+
+      customExtensionsMap.view.flatMap {
+        case (lang, extensions) => extensions.map(extension => (extension.toLowerCase, lang))
+      }.to(List).sortBy {
+        case (ext, lang) => (lang.toString, ext)
+      }
+    }
+
+    filePath.split('/').lastOption.flatMap { filename =>
+      languageByCustomExtension.collectFirst { case (ext, lang) if filename.endsWith(ext) => lang }.orElse {
+        (for {
+          extension <- filename.split('.').lastOption
+          dottedExtension = s".$extension"
+        } yield languageByExtension.get(dottedExtension.toLowerCase)).flatten
+      }.orElse(languageByFilename.get(filename.toLowerCase))
+    }
+  }
+}

src/main/scala-2.13-/com/codacy/plugins/api/languages/LanguageImpl.scala

@@ -0,0 +1,51 @@
+package com.codacy.plugins.api.languages
+
+import Languages._
+
+private[languages] object LanguagesImpl {
+  def extensionsByLanguageImpl: Map[Language, Set[String]] =
+    all.map { lang =>
+      (lang, lang.extensions)
+    }(collection.breakOut)
+
+  def filenamesByLanguageImpl: Map[Language, Set[String]] =
+    all.map { lang =>
+      (lang, lang.files)
+    }(collection.breakOut)
+
+  def languageByExtensionImpl: Map[String, Language] =
+    all.flatMap { lang =>
+      lang.extensions.map(extension => (extension.toLowerCase(), lang))
+    }(collection.breakOut)
+
+  def languageByFilenameImpl: Map[String, Language] =
+    all.flatMap { lang =>
+      lang.files.map(file => (file.toLowerCase(), lang))
+    }(collection.breakOut)
+
+  def forPathImpl(
+    filePath: String,
+    customExtensions: List[(Language, Seq[String])] = List.empty[(Language, Seq[String])]): Option[Language] = {
+    lazy val languageByCustomExtension: List[(String, Language)] = {
+      val customExtensionsMap: Map[Language, Set[String]] = customExtensions.map {
+        case (lang, exts) =>
+          (lang, exts.to[Set] ++ extensionsByLanguage.getOrElse(lang, Set.empty))
+      }(collection.breakOut)
+
+      customExtensionsMap.flatMap {
+        case (lang, extensions) => extensions.map(extension => (extension.toLowerCase, lang))
+      }.toList.sortBy {
+        case (ext, lang) => (lang.toString, ext)
+      }
+    }
+
+    filePath.split('/').lastOption.flatMap { filename =>
+      languageByCustomExtension.collectFirst { case (ext, lang) if filename.endsWith(ext) => lang }.orElse {
+        (for {
+          extension <- filename.split('.').lastOption
+          dottedExtension = s".$extension"
+        } yield languageByExtension.get(dottedExtension.toLowerCase)).flatten
+      }.orElse(languageByFilename.get(filename.toLowerCase))
+    }
+  }
+}

src/main/scala/com/codacy/plugins/api/languages/Language.scala

@@ -1,7 +1,5 @@
 package com.codacy.plugins.api.languages
 
-import scala.collection.compat._
-
 sealed abstract class Language(val extensions: Set[String],
                                val overriddenName: Option[String] = Option.empty[String],
                                val files: Set[String] = Set.empty[String]) {
@@ -13,53 +11,23 @@ sealed abstract class Language(val extensions: Set[String],
 
 object Languages {
 
-  lazy val extensionsByLanguage: Map[Language, Set[String]] = all.iterator.map { lang =>
-    (lang, lang.extensions)
-  }.toMap
+  lazy val extensionsByLanguage: Map[Language, Set[String]] = LanguagesImpl.extensionsByLanguageImpl
 
-  lazy val filenamesByLanguage: Map[Language, Set[String]] = all.iterator.map { lang =>
-    (lang, lang.files)
-  }.toMap
+  lazy val filenamesByLanguage: Map[Language, Set[String]] = LanguagesImpl.filenamesByLanguageImpl
 
-  lazy val languageByExtension: Map[String, Language] = all.iterator.flatMap { lang =>
-    lang.extensions.map(extension => (extension.toLowerCase(), lang))
-  }.toMap
+  lazy val languageByExtension: Map[String, Language] = LanguagesImpl.languageByExtensionImpl
 
-  lazy val languageByFilename: Map[String, Language] = all.iterator.flatMap { lang =>
-    lang.files.map(file => (file.toLowerCase(), lang))
-  }.toMap
+  lazy val languageByFilename: Map[String, Language] = LanguagesImpl.languageByFilenameImpl
 
   def extensions(language: Language): Option[Set[String]] = extensionsByLanguage.get(language)
 
   def filenames(language: Language): Option[Set[String]] = filenamesByLanguage.get(language)
 
   def fromName(name: String): Option[Language] = all.find(lang => name.equalsIgnoreCase(lang.name))
 
-  def forPath(
-    filePath: String,
-    customExtensions: List[(Language, Seq[String])] = List.empty[(Language, Seq[String])]): Option[Language] = {
-    lazy val languageByCustomExtension: List[(String, Language)] = {
-      val customExtensionsMap: Map[Language, Set[String]] = customExtensions.iterator.map {
-        case (lang, exts) =>
-          (lang, exts.to(Set) ++ extensionsByLanguage.getOrElse(lang, Set.empty))
-      }.toMap
-
-      customExtensionsMap.flatMap {
-        case (lang, extensions) => extensions.map(extension => (extension.toLowerCase, lang))
-      }.toList.sortBy {
-        case (ext, lang) => (lang.toString, ext)
-      }
-    }
-
-    filePath.split('/').lastOption.flatMap { filename =>
-      languageByCustomExtension.collectFirst { case (ext, lang) if filename.endsWith(ext) => lang }.orElse {
-        (for {
-          extension <- filename.split('.').lastOption
-          dottedExtension = s".$extension"
-        } yield languageByExtension.get(dottedExtension.toLowerCase)).flatten
-      }.orElse(languageByFilename.get(filename.toLowerCase))
-    }
-  }
+  def forPath(filePath: String,
+              customExtensions: List[(Language, Seq[String])] = List.empty[(Language, Seq[String])]): Option[Language] =
+    LanguagesImpl.forPathImpl(filePath, customExtensions)
 
   def filter(files: Set[String],
              languages: Set[Language],