Mirrors/brackets
1
0
Fork 0
mirror of https://github.com/adobe/brackets.git synced 2024-11-20 18:02:54 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
ficristo 2015-09-05 13:41:21 +02:00
commit 3ab1a31e21
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/extensions/default/JavaScriptCodeHints/HintUtils.js
View File

@ -177,10 +177,11 @@ define(function (require, exports, module) {
}
var KEYWORD_NAMES = [
"break", "case", "catch", "continue", "debugger", "default", "delete",
"do", "else", "finally", "for", "function", "if", "in", "instanceof",
"new", "return", "switch", "this", "throw", "try", "typeof", "var",
"void", "while", "with"
"break", "case", "catch", "class", "const", "continue", "debugger",
"default", "delete", "do", "else", "export", "extends", "finally",
"for", "function", "if", "import", "in", "instanceof", "let", "new",
"return", "super", "switch", "this", "throw", "try", "typeof", "var",
"void", "while", "with", "yield"
],
KEYWORD_TOKENS = KEYWORD_NAMES.map(function (t) {
return makeToken(t, []);

2
src/thirdparty/CodeMirror vendored

@ -1 +1 @@
Subproject commit 52ad899d8b45df43667cd3d8e6541c21a07ff053
Subproject commit 61ca2db598f3f1d79e837f326bc740e8bc49e62a