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

CppEditor: Fix "move function definition"

Browse Source 
... for member functions with exception specification and/or reference
qualifiers.
The FunctionDeclaratorAST::cv_qualifier_list member can contain both the
proper qualifiers "const" and "volatile" as well as the pseudo-qualifiers
"override" and "final". The problem is that the former appear before
exception specification and reference qualifiers, whereas the latter come
afterwards. Therefore, when calculating the declarator's first and last
tokens, we can't just mechanically check the different declarator members
in order. Instead, we need to compare the token values to see which
comes first.

Task-number: QTCREATORBUG-27132
Change-Id: I924f9afe49453fa51b4a2fe010d1cc00c9defad1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2022-04-04 18:05:31 +02:00
parent 0ee4322dfd
commit cb86ca547a
3 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/cppeditor/cppquickfix_test.cpp
View File

@@ -6110,6 +6110,41 @@ void QuickfixTest::testMoveFuncDefOutsideMemberFuncToCppWithInlinePartOfName()
QuickFixOperationTest(testDocuments, &factory);
}
void QuickfixTest::testMoveFuncDefOutsideMixedQualifiers()
{
QList<TestDocumentPtr> testDocuments;
QByteArray original;
QByteArray expected;
// Header File
original = R"(
struct Base {
virtual auto func() const && noexcept -> void = 0;
};
struct Derived : public Base {
auto @func() const && noexcept -> void override {}
};)";
expected = R"(
struct Base {
virtual auto func() const && noexcept -> void = 0;
};
struct Derived : public Base {
auto func() const && noexcept -> void override;
};)";
testDocuments << CppTestDocument::create("file.h", original, expected);
// Source File
original = "#include \"file.h\"\n";
expected = R"DELIM(#include "file.h"
void Derived::func() const &&noexcept {}
)DELIM";
testDocuments << CppTestDocument::create("file.cpp", original, expected);
MoveFuncDefOutside factory;
QuickFixOperationTest(testDocuments, &factory);
}
void QuickfixTest::testMoveFuncDefOutsideMemberFuncToCppInsideNS()
{
QList<TestDocumentPtr> testDocuments;