forked from qt-creator/qt-creator
qmljs: basic highlighting for es7
Task-number: QTCREATORBUG-21301 Change-Id: Ic59cbd68b1d40e34a87d3d8ebe5f2d8e7f413858 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
@@ -34,20 +34,25 @@ static const QString js_keywords[] = {
|
|||||||
QLatin1String("break"),
|
QLatin1String("break"),
|
||||||
QLatin1String("case"),
|
QLatin1String("case"),
|
||||||
QLatin1String("catch"),
|
QLatin1String("catch"),
|
||||||
|
QLatin1String("class"),
|
||||||
|
QLatin1String("const"),
|
||||||
QLatin1String("continue"),
|
QLatin1String("continue"),
|
||||||
QLatin1String("debugger"),
|
QLatin1String("debugger"),
|
||||||
QLatin1String("default"),
|
QLatin1String("default"),
|
||||||
QLatin1String("delete"),
|
QLatin1String("delete"),
|
||||||
QLatin1String("do"),
|
QLatin1String("do"),
|
||||||
QLatin1String("else"),
|
QLatin1String("else"),
|
||||||
|
QLatin1String("extends"),
|
||||||
QLatin1String("finally"),
|
QLatin1String("finally"),
|
||||||
QLatin1String("for"),
|
QLatin1String("for"),
|
||||||
QLatin1String("function"),
|
QLatin1String("function"),
|
||||||
QLatin1String("if"),
|
QLatin1String("if"),
|
||||||
QLatin1String("in"),
|
QLatin1String("in"),
|
||||||
QLatin1String("instanceof"),
|
QLatin1String("instanceof"),
|
||||||
|
QLatin1String("let"),
|
||||||
QLatin1String("new"),
|
QLatin1String("new"),
|
||||||
QLatin1String("return"),
|
QLatin1String("return"),
|
||||||
|
QLatin1String("super"),
|
||||||
QLatin1String("switch"),
|
QLatin1String("switch"),
|
||||||
QLatin1String("this"),
|
QLatin1String("this"),
|
||||||
QLatin1String("throw"),
|
QLatin1String("throw"),
|
||||||
@@ -56,7 +61,8 @@ static const QString js_keywords[] = {
|
|||||||
QLatin1String("var"),
|
QLatin1String("var"),
|
||||||
QLatin1String("void"),
|
QLatin1String("void"),
|
||||||
QLatin1String("while"),
|
QLatin1String("while"),
|
||||||
QLatin1String("with")
|
QLatin1String("with"),
|
||||||
|
QLatin1String("yield")
|
||||||
};
|
};
|
||||||
} // end of anonymous namespace
|
} // end of anonymous namespace
|
||||||
|
|
||||||
@@ -274,6 +280,7 @@ QList<Token> Scanner::operator()(const QString &text, int startState)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case '\'':
|
case '\'':
|
||||||
|
case '`':
|
||||||
case '"': {
|
case '"': {
|
||||||
const QChar quote = ch;
|
const QChar quote = ch;
|
||||||
const int start = index;
|
const int start = index;
|
||||||
|
Reference in New Issue
Block a user