diff options
author | Maximilian Goldstein <max.goldstein@qt.io> | 2020-09-04 11:22:12 +0200 |
---|---|---|
committer | Maximilian Goldstein <max.goldstein@qt.io> | 2020-09-04 12:33:24 +0200 |
commit | 5d9b0d30df831649ceed58fee778bb37ac6f630e (patch) | |
tree | 0865b0f5b604989df379b93b98bc1f60d728e453 /tools/qmlformat | |
parent | 18b13c9126a3cbc32c616621802165591a5e2f5f (diff) |
qmlformat: Fix multiline comment attachment
Pick-to: 5.15
Change-Id: I3ba8a4cd683df3309dd6df31b1fd426a0875f8fa
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools/qmlformat')
-rw-r--r-- | tools/qmlformat/commentastvisitor.cpp | 5 | ||||
-rw-r--r-- | tools/qmlformat/commentastvisitor.h | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/tools/qmlformat/commentastvisitor.cpp b/tools/qmlformat/commentastvisitor.cpp index 9383fa29aa..b8d916d3fb 100644 --- a/tools/qmlformat/commentastvisitor.cpp +++ b/tools/qmlformat/commentastvisitor.cpp @@ -68,7 +68,8 @@ QList<SourceLocation> CommentAstVisitor::findCommentsInLine(quint32 line, bool i return results; for (const auto &location : m_engine->comments()) { - if (location.startLine != line) + Comment comment(m_engine, Comment::Location::Front, { location }); + if (line < location.startLine || line > comment.endLine()) continue; if (isCommentAttached(location)) @@ -78,7 +79,7 @@ QList<SourceLocation> CommentAstVisitor::findCommentsInLine(quint32 line, bool i if (includePrevious) { // See if we can find any more comments above this one - auto previous = findCommentsInLine(line - 1, true); + auto previous = findCommentsInLine(location.startLine - 1, true); // Iterate it in reverse to restore the correct order for (auto it = previous.rbegin(); it != previous.rend(); it++) { diff --git a/tools/qmlformat/commentastvisitor.h b/tools/qmlformat/commentastvisitor.h index 21c7eb6416..6ebf8246ba 100644 --- a/tools/qmlformat/commentastvisitor.h +++ b/tools/qmlformat/commentastvisitor.h @@ -78,6 +78,14 @@ struct Comment return false; } + quint32 endLine() const + { + if (isSyntheticMultiline() || !isValid()) + return 0; + + return m_srcLocations[0].startLine + m_text.count(QLatin1Char('\n')); + } + QString m_text; }; |