File tree Expand file tree Collapse file tree 3 files changed +24
-14
lines changed
codacy-plugins-api/src/main
scala-2.13+/com/codacy/plugins/api/languages
scala-2.13-/com/codacy/plugins/api/languages
scala/com/codacy/plugins/api/languages Expand file tree Collapse file tree 3 files changed +24
-14
lines changed Original file line number Diff line number Diff line change @@ -40,12 +40,17 @@ private[languages] object LanguagesImpl {
4040 }
4141
4242 filePath.split('/' ).lastOption.flatMap { filename =>
43- languageByCustomExtension.collectFirst { case (ext, lang) if filename.endsWith(ext) => lang }.orElse {
44- (for {
45- extension <- filename.split('.' ).lastOption
46- dottedExtension = s " . $extension"
47- } yield languageByExtension.get(dottedExtension.toLowerCase)).flatten
48- }.orElse(languageByFilename.get(filename.toLowerCase))
43+ languageByFilename
44+ .get(filename.toLowerCase)
45+ .orElse {
46+ languageByCustomExtension.collectFirst { case (ext, lang) if filename.endsWith(ext) => lang }
47+ }
48+ .orElse {
49+ (for {
50+ extension <- filename.split('.' ).lastOption
51+ dottedExtension = s " . $extension"
52+ } yield languageByExtension.get(dottedExtension.toLowerCase)).flatten
53+ }
4954 }
5055 }
5156}
Original file line number Diff line number Diff line change @@ -40,12 +40,17 @@ private[languages] object LanguagesImpl {
4040 }
4141
4242 filePath.split('/' ).lastOption.flatMap { filename =>
43- languageByCustomExtension.collectFirst { case (ext, lang) if filename.endsWith(ext) => lang }.orElse {
44- (for {
45- extension <- filename.split('.' ).lastOption
46- dottedExtension = s " . $extension"
47- } yield languageByExtension.get(dottedExtension.toLowerCase)).flatten
48- }.orElse(languageByFilename.get(filename.toLowerCase))
43+ languageByFilename
44+ .get(filename.toLowerCase)
45+ .orElse {
46+ languageByCustomExtension.collectFirst { case (ext, lang) if filename.endsWith(ext) => lang }
47+ }
48+ .orElse {
49+ (for {
50+ extension <- filename.split('.' ).lastOption
51+ dottedExtension = s " . $extension"
52+ } yield languageByExtension.get(dottedExtension.toLowerCase)).flatten
53+ }
4954 }
5055 }
5156}
Original file line number Diff line number Diff line change @@ -127,7 +127,7 @@ object Languages {
127127 " Vagabondfile" ,
128128 " Fastfile" ))
129129
130- case object Java extends Language (extensions = Set (" .java" ), files = Set (" pom.xml " , " gradle.lockfile " ))
130+ case object Java extends Language (extensions = Set (" .java" ), files = Set (" gradle.lockfile " , " pom.xml " ))
131131
132132 case object CoffeeScript extends Language (extensions = Set (" .coffee" ))
133133
@@ -181,7 +181,7 @@ object Languages {
181181 case object LESS extends Language (extensions = Set (" .less" ))
182182
183183 // Support startdate: March 2017
184- case object Go extends Language (extensions = Set (" .go" ), files = Set (" go.mod" ))
184+ case object Go extends Language (extensions = Set (" .go" ), files = Set (" go.mod" , " go.sum " ))
185185
186186 case object JSP extends Language (extensions = Set (" .jsp" ))
187187
You can’t perform that action at this time.
0 commit comments