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-16 09:24:29 +0200 |
| commit | 33f97b6521e0f1ea408fc49cb5c6d55b5b7077bd (patch) | |
| tree | 7fffe8267f08d619fbeaf405b7bc2c47cd489827 /tests | |
| parent | bf65961f37c169ddfb358dcd0aef739989e4d88e (diff) | |
qmlformat: Fix multiline comment attachment
Change-Id: I3ba8a4cd683df3309dd6df31b1fd426a0875f8fa
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 5d9b0d30df831649ceed58fee778bb37ac6f630e)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qmlformat/data/multilineComment.formatted.qml | 12 | ||||
| -rw-r--r-- | tests/auto/qml/qmlformat/data/multilineComment.qml | 10 | ||||
| -rw-r--r-- | tests/auto/qml/qmlformat/tst_qmlformat.cpp | 7 |
3 files changed, 29 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlformat/data/multilineComment.formatted.qml b/tests/auto/qml/qmlformat/data/multilineComment.formatted.qml new file mode 100644 index 0000000000..830ff32095 --- /dev/null +++ b/tests/auto/qml/qmlformat/data/multilineComment.formatted.qml @@ -0,0 +1,12 @@ +Item { + Item { + } + + // This is a multiline comment. + // it should stay attached to Commented instead of getting orphaned. + // + // This should also stick to Commented + Commented { + } + +} diff --git a/tests/auto/qml/qmlformat/data/multilineComment.qml b/tests/auto/qml/qmlformat/data/multilineComment.qml new file mode 100644 index 0000000000..27439c41fa --- /dev/null +++ b/tests/auto/qml/qmlformat/data/multilineComment.qml @@ -0,0 +1,10 @@ +Item { + Item {} + + /* This is a multiline comment. + it should stay attached to Commented instead of getting orphaned. + */ + // This should also stick to Commented + Commented {} + +} diff --git a/tests/auto/qml/qmlformat/tst_qmlformat.cpp b/tests/auto/qml/qmlformat/tst_qmlformat.cpp index a3f5cd1a2b..3b1f232139 100644 --- a/tests/auto/qml/qmlformat/tst_qmlformat.cpp +++ b/tests/auto/qml/qmlformat/tst_qmlformat.cpp @@ -49,6 +49,7 @@ private Q_SLOTS: void testLineEndings(); void testFrontInline(); void testIfBlocks(); + void testMultilineComments(); void testReadOnlyProps(); void testVerbatimStrings(); @@ -221,6 +222,12 @@ void TestQmlformat::testIfBlocks() QCOMPARE(runQmlformat(testFile("IfBlocks.qml"), false, true), readTestFile("IfBlocks.formatted.qml")); } +void TestQmlformat::testMultilineComments() +{ + QCOMPARE(runQmlformat(testFile("multilineComment.qml"), false, true), readTestFile("multilineComment.formatted.qml")); +} + + void TestQmlformat::testReadOnlyProps() { QCOMPARE(runQmlformat(testFile("readOnlyProps.qml"), false, true), readTestFile("readOnlyProps.formatted.qml")); |