Merge 2a69774 into 1ab0381

streetsidesoftware · May 23, 2018 · c654304 · c654304
2 parents 1ab0381 + 2a69774
commit c654304
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/dictionaries/filetypes.txt b/dictionaries/filetypes.txt
@@ -108,6 +108,7 @@ md
 mdoc
 mdown
 menu
+mjs
 mk
 mm
 mxml

diff --git a/src/LanguageIds.ts b/src/LanguageIds.ts
@@ -55,7 +55,7 @@ export const languageExtensionDefinitions: LanguageExtensionDefinitions = [
     { id: 'jade', extensions: ['.jade', '.pug'], },
     { id: 'java', extensions: ['.java', '.jav'], },
     { id: 'javascriptreact', extensions: ['.jsx'], },
-    { id: 'javascript', extensions: ['.js', '.es6'], },
+    { id: 'javascript', extensions: ['.js', '.mjs', '.es6'], },
     { id: 'json', extensions: [
             '.json',
             '.bowerrc',