diff options
| author | Maximilian Goldstein <max.goldstein@qt.io> | 2020-07-01 10:45:46 +0200 |
|---|---|---|
| committer | Maximilian Goldstein <max.goldstein@qt.io> | 2020-07-02 09:58:58 +0200 |
| commit | 9df9059a4b88676c7352db92391de2c268550fc0 (patch) | |
| tree | c8c0db0a12285cc8fe9369a177c730069a839bf5 | |
| parent | bdf70ab049f5e7a74d760c30de72c074b83792fb (diff) | |
qmlformat: Fix template literals
Fixes: QTBUG-85317
Pick-to: 5.15
Change-Id: I52589b681690a55f7bba7d7d9c675dc22ffa1587
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | tests/auto/qml/qmlformat/data/verbatimString.formatted.qml | 3 | ||||
| -rw-r--r-- | tests/auto/qml/qmlformat/data/verbatimString.qml | 3 | ||||
| -rw-r--r-- | tools/qmlformat/dumpastvisitor.cpp | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlformat/data/verbatimString.formatted.qml b/tests/auto/qml/qmlformat/data/verbatimString.formatted.qml index fa7fbbe32b..84abe38f88 100644 --- a/tests/auto/qml/qmlformat/data/verbatimString.formatted.qml +++ b/tests/auto/qml/qmlformat/data/verbatimString.formatted.qml @@ -1,4 +1,7 @@ Item { property string verbatim1: 'A "verbatim" string!' property string verbatim2: "A 'verbatim' string\u2757" + property string verbatim3: `400 + 300 is ${400 + 300}. + +mutliline` } diff --git a/tests/auto/qml/qmlformat/data/verbatimString.qml b/tests/auto/qml/qmlformat/data/verbatimString.qml index 15b080a87b..fa16b97dca 100644 --- a/tests/auto/qml/qmlformat/data/verbatimString.qml +++ b/tests/auto/qml/qmlformat/data/verbatimString.qml @@ -1,4 +1,7 @@ Item { property string verbatim1: 'A "verbatim" string!' property string verbatim2: "A 'verbatim' string\u2757" +property string verbatim3: `400 + 300 is ${400 + 300}. + +mutliline` }
\ No newline at end of file diff --git a/tools/qmlformat/dumpastvisitor.cpp b/tools/qmlformat/dumpastvisitor.cpp index 24d4dd454d..57a1ea9fcb 100644 --- a/tools/qmlformat/dumpastvisitor.cpp +++ b/tools/qmlformat/dumpastvisitor.cpp @@ -418,6 +418,12 @@ QString DumpAstVisitor::parseExpression(ExpressionNode *expression) return "--"+parseExpression(cast<PreDecrementExpression *>(expression)->expression); case Node::Kind_NumericLiteral: return QString::number(cast<NumericLiteral *>(expression)->value); + case Node::Kind_TemplateLiteral: { + auto firstSrcLoc = cast<TemplateLiteral *>(expression)->firstSourceLocation(); + auto lastSrcLoc = cast<TemplateLiteral *>(expression)->lastSourceLocation(); + return m_engine->code().mid(static_cast<int>(firstSrcLoc.begin()), + static_cast<int>(lastSrcLoc.end() - firstSrcLoc.begin())); + } case Node::Kind_StringLiteral: { auto srcLoc = cast<StringLiteral *>(expression)->firstSourceLocation(); return m_engine->code().mid(static_cast<int>(srcLoc.begin()), |