Merge branch 'master' into remove-servant

github · Jun 24, 2019 · 474985c · 474985c
2 parents 6dda325 + c8fd375
commit 474985c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Data/Language.hs b/src/Data/Language.hs
@@ -108,6 +108,7 @@ languageForType mediaType = case mediaType of
     ".rb"   -> Ruby
     ".go"   -> Go
     ".js"   -> JavaScript
+    ".mjs"  -> JavaScript
     ".ts"   -> TypeScript
     ".tsx"  -> TSX
     ".jsx"  -> JSX
@@ -120,7 +121,7 @@ extensionsForLanguage :: Language -> [String]
 extensionsForLanguage language = case language of
   Go         -> [".go"]
   Haskell    -> [".hs"]
-  JavaScript -> [".js"]
+  JavaScript -> [".js", ".mjs"]
   PHP        -> [".php"]
   Python     -> [".py"]
   Ruby       -> [".rb"]
@@ -134,7 +135,7 @@ languageForFilePath :: FilePath -> Language
 languageForFilePath = languageForType . takeExtension
 
 supportedExts :: [String]
-supportedExts = [".go", ".py", ".rb", ".js", ".ts", ".php", ".phpt"]
+supportedExts = [".go", ".py", ".rb", ".js", ".mjs", ".ts", ".php", ".phpt"]
 
 codeNavLanguages :: [Language]
 codeNavLanguages = [Go, Ruby, Python, JavaScript, PHP, TypeScript]