mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
Add .mjs to known JavaScript file extensions (#25747)
Also add .es6 in missing places
This commit is contained in:
parent
0a6066eebf
commit
d6c61a0e12
|
@ -41,7 +41,8 @@
|
|||
],
|
||||
"extensions": [
|
||||
".js",
|
||||
".es6"
|
||||
".es6",
|
||||
".mjs"
|
||||
],
|
||||
"filenames": [
|
||||
"jakefile"
|
||||
|
|
|
@ -3,7 +3,9 @@
|
|||
"scopeName": "source.js",
|
||||
"fileTypes": [
|
||||
".js",
|
||||
".jsx"
|
||||
".jsx",
|
||||
".es6",
|
||||
".mjs"
|
||||
],
|
||||
"uuid": "805375ec-d614-41f5-8993-5843fe63ea82",
|
||||
"patterns": [
|
||||
|
|
|
@ -34,7 +34,7 @@ const languages = [
|
|||
{ name: 'groovy', identifiers: ['groovy', 'gvy'], source: 'source.groovy' },
|
||||
{ name: 'jade', identifiers: ['jade'], source: 'text.jade' },
|
||||
|
||||
{ name: 'js', identifiers: ['js', 'jsx', 'javascript'], source: 'source.js' },
|
||||
{ name: 'js', identifiers: ['js', 'jsx', 'javascript', 'es6', 'mjs'], source: 'source.js' },
|
||||
{ name: 'js_regexp', identifiers: ['regexp'], source: 'source.js.regexp' },
|
||||
{ name: 'json', identifiers: ['json', 'sublime-settings', 'sublime-menu', 'sublime-keymap', 'sublime-mousemap', 'sublime-theme', 'sublime-build', 'sublime-project', 'sublime-completions'], source: 'source.json' },
|
||||
{ name: 'less', identifiers: ['less'], source: 'source.css.less' },
|
||||
|
|
|
@ -1965,7 +1965,7 @@
|
|||
<key>fenced_code_block_js</key>
|
||||
<dict>
|
||||
<key>begin</key>
|
||||
<string>(^|\G)(\s*)([`~]{3,})\s*((js|jsx|javascript)(\s+[^`~]*)?$)</string>
|
||||
<string>(^|\G)(\s*)([`~]{3,})\s*((js|jsx|javascript|es6|mjs)(\s+[^`~]*)?$)</string>
|
||||
<key>name</key>
|
||||
<string>markup.fenced_code.block.markdown</string>
|
||||
<key>end</key>
|
||||
|
|
|
@ -8,7 +8,7 @@ var updateGrammar = require('../../../build/npm/update-grammar');
|
|||
|
||||
function adaptToJavaScript(grammar) {
|
||||
grammar.name = 'JavaScript (with React support)';
|
||||
grammar.fileTypes = ['.js', '.jsx' ];
|
||||
grammar.fileTypes = ['.js', '.jsx', '.es6', '.mjs' ];
|
||||
grammar.scopeName = 'source.js';
|
||||
|
||||
var fixScopeNames = function(rule) {
|
||||
|
|
|
@ -84,7 +84,7 @@ export function activate(context: ExtensionContext): void {
|
|||
id: 'javascript',
|
||||
diagnosticSource: 'js',
|
||||
modeIds: [MODE_ID_JS, MODE_ID_JSX],
|
||||
extensions: ['.js', '.jsx'],
|
||||
extensions: ['.js', '.jsx', '.es6', '.mjs'],
|
||||
configFile: 'jsconfig.json'
|
||||
}
|
||||
], context.storagePath, context.globalState, context.workspaceState);
|
||||
|
|
|
@ -15,12 +15,12 @@ suite('Glob', () => {
|
|||
// let patterns = [
|
||||
// '{**/*.cs,**/*.json,**/*.csproj,**/*.sln}',
|
||||
// '{**/*.cs,**/*.csproj,**/*.sln}',
|
||||
// '{**/*.ts,**/*.tsx,**/*.js,**/*.jsx,**/*.es6}',
|
||||
// '{**/*.ts,**/*.tsx,**/*.js,**/*.jsx,**/*.es6,**/*.mjs}',
|
||||
// '**/*.go',
|
||||
// '{**/*.ps,**/*.ps1}',
|
||||
// '{**/*.c,**/*.cpp,**/*.h}',
|
||||
// '{**/*.fsx,**/*.fsi,**/*.fs,**/*.ml,**/*.mli}',
|
||||
// '{**/*.js,**/*.jsx,**/*.es6}',
|
||||
// '{**/*.js,**/*.jsx,**/*.es6,**/*.mjs}',
|
||||
// '{**/*.ts,**/*.tsx}',
|
||||
// '{**/*.php}',
|
||||
// '{**/*.php}',
|
||||
|
|
Loading…
Reference in a new issue