Switch over to using lingo

Author: tclem

cabal.project

@@ -14,3 +14,8 @@ source-repository-package
   type: git
   location: https://github.com/joshvera/proto3-wire.git
   tag: 84664e22f01beb67870368f1f88ada5d0ad01f56
+
+source-repository-package
+  type: git
+  location: https://github.com/tclem/lingo-haskell.git
+  tag: 7a453568556d7b6ab6fb4573b158b41cef56f7cc

semantic.cabal

@@ -73,6 +73,7 @@ common dependencies
                      , unix ^>= 2.7.2.2
                      , proto3-suite
                      , proto3-wire
+                     , lingo
 
 common executable-flags
   ghc-options:         -threaded -rtsopts "-with-rtsopts=-N -A4m -n2m"

src/Data/Blob/IO.hs

@@ -38,7 +38,7 @@ readBlobsFromDir :: MonadIO m => FilePath -> m [Blob]
 readBlobsFromDir path = liftIO . fmap catMaybes $
   findFilesInDir path supportedExts mempty >>= Async.mapConcurrently (readBlobFromFile . fileForPath)
 
--- | Read all blobs from the Git repo with Language.supportedExts
+-- | Read all blobs from a git repo
 readBlobsFromGitRepo :: MonadIO m => FilePath -> Git.OID -> [FilePath] -> [FilePath] -> m [Blob]
 readBlobsFromGitRepo path oid excludePaths includePaths = liftIO . fmap catMaybes $
   Git.lsTree path oid >>= Async.mapConcurrently (blobFromTreeEntry path)

src/Data/Language.hs

@@ -7,12 +7,12 @@ module Data.Language
   , knownLanguage
   , languageForFilePath
   , pathIsMinified
-  , languageForType
   , supportedExts
   , codeNavLanguages
   ) where
 
 import           Data.Aeson
+import qualified Data.Languages as Lingo
 import qualified Data.Text as T
 import           Prologue
 import           System.FilePath.Posix
@@ -98,25 +98,6 @@ parseLanguage l = case T.toLower l of
 knownLanguage :: Language -> Bool
 knownLanguage = (/= Unknown)
 
--- | Returns a Language based on the file extension (including the ".").
-languageForType :: String -> Language
-languageForType mediaType = case mediaType of
-    ".java" -> Java
-    ".json" -> JSON
-    ".hs"   -> Haskell
-    ".md"   -> Markdown
-    ".rb"   -> Ruby
-    ".go"   -> Go
-    ".js"   -> JavaScript
-    ".mjs"  -> JavaScript
-    ".ts"   -> TypeScript
-    ".tsx"  -> TSX
-    ".jsx"  -> JSX
-    ".py"   -> Python
-    ".php"  -> PHP
-    ".phpt" -> PHP
-    _       -> Unknown
-
 extensionsForLanguage :: Language -> [String]
 extensionsForLanguage language = case language of
   Go         -> [".go"]
@@ -130,9 +111,22 @@ extensionsForLanguage language = case language of
   JSX        -> [".jsx"]
   _          -> []
 
--- | Return a language based on a FilePath's extension, or Nothing if extension is not found or not supported.
+-- | Return a language based on a FilePath's extension.
 languageForFilePath :: FilePath -> Language
-languageForFilePath = languageForType . takeExtension
+languageForFilePath path = case Lingo.languageName <$> Lingo.languageForPath path of
+  Just "Go" -> Go
+  Just "Haskell" -> Haskell
+  Just "Java" -> Java
+  Just "JavaScript" -> JavaScript
+  Just "JSON" -> JSON
+  Just "JSX" -> JSX
+  Just "Markdown" -> Markdown
+  Just "PHP" -> PHP
+  Just "Python" -> Python
+  Just "Ruby" -> Ruby
+  Just "TSX" -> TSX
+  Just "TypeScript" -> TypeScript
+  _ -> Unknown
 
 supportedExts :: [String]
 supportedExts = [".go", ".py", ".rb", ".js", ".mjs", ".ts", ".php", ".phpt"]