maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[javascript] Bring back ES6 syntax highlighting support #133

Browse source
This commit is contained in:
Martin Aeschlimann 2015-12-03 16:00:46 +01:00
parent 82c0e30d80
commit 0b3f7b223d
5 changed files with 1618 additions and 578 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extensions/javascript/OSSREADME.json
View file

@ -1,11 +1,11 @@
// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
[{
"name": "typescript-sublime-plugin",
"version": "0.1.8",
"name": "Microsoft/TypeScript-TmLanguage",
"version": "0.0.1",
"license": "Apache2",
"repositoryURL": "https://github.com/Microsoft/TypeScript-Sublime-Plugin",
"description": "The file syntaxes/JavaScriptReact.tmLanguage was derived from the TypeScript-Sublime-Plugin https://github.com/Microsoft/TypeScript-Sublime-Plugin.",
"repositoryURL": "https://github.com/Microsoft/TypeScript-TmLanguage",
"description": "The files syntaxes/JavaScriptReact.tmLanguage & syntaxes/JavaScript.tmLanguage were derived from TypeScript-TmLanguage https://github.com/Microsoft/TypeScript-TmLanguage.",
"licenseDetail": [
// Reason: LICENSE file does not include Copyright statement
"Copyright (c) Microsoft Corporation. All rights reserved.",

4
extensions/javascript/package.json
View file

@ -9,8 +9,7 @@
"aliases": ["JavaScript React","jsx"],
"extensions": [".jsx"],
"configuration": "./javascript.configuration.json"
},
{
},{
"id": "javascript",
"aliases": ["JavaScript", "javascript", "js"],
"extensions": [".js", ".es6"],
@ -27,6 +26,7 @@
"scopeName": "source.js",
"path": "./syntaxes/JavaScript.tmLanguage"
},{
// referenced by other grammars
"scopeName": "source.js.regexp",
"path": "./syntaxes/Regular Expressions (JavaScript).tmLanguage"
}],

2162
extensions/javascript/syntaxes/JavaScript.tmLanguage
View file

File diff suppressed because it is too large Load diff

7
extensions/javascript/syntaxes/Readme.md
View file

@ -3,3 +3,10 @@ The JavaScriptReact.tmLanguage bundle is derived from the TypeScriptReact.tmLang
Changes:
- fileTypes -> .jsx
- scopeName -> scope.jsx
The JavaScript-ts.tmLanguage bundle is derived from the TypeScriptReact.tmLanguage.
Changes:
- all occurences of .ts -> .js
- fileTypes -> .js
- scopeName -> scope.js

15
src/vs/editor/browser/widget/media/tokens.css
View file

@ -391,8 +391,9 @@
.monaco-editor.vs .token.meta.preprocessor { color: #0000FF; }
.monaco-editor.vs .token.meta.preprocessor.string { color: #A31515; }
.monaco-editor.vs .token.meta.preprocessor.numeric { color: #09885A; }
.monaco-editor.vs .token.meta.object.type { color: #2B91AF; }
.monaco-editor.vs .token.meta.object.type.variable { color: #000000; }
.monaco-editor.vs .token.meta.cast { color: #2B91AF; }
.monaco-editor.vs .token.meta.parameter.type { color: #2B91AF; }
.monaco-editor.vs .token.meta.parameter.type.variable { color: #000000; }
.monaco-editor.vs .token.storage { color: #0000FF; }
.monaco-editor.vs .token.storage.content { color: red; }
@ -527,8 +528,9 @@
.monaco-editor.vs-dark .token.meta.preprocessor { color: #569CD6; }
.monaco-editor.vs-dark .token.meta.preprocessor.string { color: #CE9178; }
.monaco-editor.vs-dark .token.meta.preprocessor.numeric { color: #B5CEA8; }
.monaco-editor.vs-dark .token.meta.object.type { color: #569CD6; }
.monaco-editor.vs-dark .token.meta.object.type.variable { color: #9CDCFE; }
.monaco-editor.vs-dark .token.meta.cast { color: #569CD6; }
.monaco-editor.vs-dark .token.meta.parameter.type { color: #569CD6; }
.monaco-editor.vs-dark .token.meta.parameter.type.variable { color: #9CDCFE; }
.monaco-editor.vs-dark .token.storage { color: #569CD6; }
.monaco-editor.vs-dark .token.storage.content { color: #9CDCFE; }
@ -666,8 +668,9 @@
.monaco-editor.hc-black .token.meta.preprocessor { color: #569CD6; }
.monaco-editor.hc-black .token.meta.preprocessor.string { color: #CE9178; }
.monaco-editor.hc-black .token.meta.preprocessor.numeric { color: #B5CEA8; }
.monaco-editor.hc-black .token.meta.object.type { color: #569CD6; }
.monaco-editor.hc-black .token.meta.object.type.variable { color: #D4D4D4; }
.monaco-editor.hc-black .token.meta.cast { color: #569CD6; }
.monaco-editor.hc-black .token.meta.parameter.type { color: #569CD6; }
.monaco-editor.hc-black .token.meta.parameter.type.variable { color: #9CDCFE; }
.monaco-editor.hc-black .token.storage { color: #569CD6; }
.monaco-editor.hc-black .token.storage.content { color: #9CDCFE; }