feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Change-Id: Ib95ec2c50c4bbaefd4ed0ec5af191ccc846c824f
This commit is contained in:
Eike Ziller
2020-05-04 10:52:34 +02:00
parent 21e9947c21 f553e3d16a
commit be73f41ad4
30 changed files with 331 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/qmljs/parser/qmljslexer.cpp
View File

@@ -872,7 +872,6 @@ int Lexer::scanString(ScanStringMode mode)
{
QChar quote = (mode == TemplateContinuation) ? QChar(TemplateHead) : QChar(mode);
bool multilineStringLiteral = false;
bool escaped = false;
const QChar *startCode = _codePtr - 1;
// in case we just parsed a \r, we need to reset this flag to get things working
@@ -881,23 +880,16 @@ int Lexer::scanString(ScanStringMode mode)
if (_engine) {
while (_codePtr <= _endPtr) {
if (escaped) { // former char started an escape sequence
escaped = false;
_char = *_codePtr++;
++_currentColumnNumber;
continue;
}
if (isLineTerminator()) {
if ((quote == QLatin1Char('`') || qmlMode()))
if ((quote == QLatin1Char('`') || qmlMode())) {
--_currentLineNumber;
break;
}
_errorCode = IllegalCharacter;
_errorMessage = QCoreApplication::translate("QmlParser", "Stray newline in string literal");
return T_ERROR;
} else if (_char == QLatin1Char('\\')) {
if (mode != DoubleQuote && mode != SingleQuote)
break;
else // otherwise we need to handle an escape sequence
escaped = true;
break;
} else if (_char == '$' && quote == QLatin1Char('`')) {
break;
} else if (_char == quote) {
@@ -923,6 +915,7 @@ int Lexer::scanString(ScanStringMode mode)
// rewind by one char, so things gets scanned correctly
--_codePtr;
--_currentColumnNumber;
_validTokenText = true;
_tokenText = QString(startCode, _codePtr - startCode);