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

CPlusPlus: Properly categorize usages in switch and case statements

Browse Source 
Change-Id: Iafbbdcca23db38d82bbc5bb24a39dac2a6d0a764
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-10-30 15:18:12 +01:00
parent 9879820864
commit 89644e4a06
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/cplusplus/FindUsages.cpp
View File

@@ -330,6 +330,10 @@ Usage::Type FindUsages::getType(int line, int column, int tokenIndex)
for (auto it = astPath.rbegin() + 1; it != astPath.rend(); ++it) { for (auto it = astPath.rbegin() + 1; it != astPath.rend(); ++it) {
if ((*it)->asExpressionStatement()) if ((*it)->asExpressionStatement())
return Usage::Type::Read; return Usage::Type::Read;
if ((*it)->asSwitchStatement())
return Usage::Type::Read;
if ((*it)->asCaseStatement())
return Usage::Type::Read;
if ((*it)->asLambdaCapture() || (*it)->asNamedTypeSpecifier() if ((*it)->asLambdaCapture() || (*it)->asNamedTypeSpecifier()
|| (*it)->asElaboratedTypeSpecifier()) { || (*it)->asElaboratedTypeSpecifier()) {
return Usage::Type::Other; return Usage::Type::Other;

21
tests/auto/cplusplus/findusages/tst_findusages.cpp
View File

@@ -2078,6 +2078,12 @@ int main()
s.n.nonConstFunc(); s.n.nonConstFunc();
s.n.constFunc(s.value); s.n.constFunc(s.value);
delete s.p; delete s.p;
switch (S::value) {
case S::value: break;
}
switch (S::value = 5) {
default: break;
}
} }
)"; )";
@@ -2103,7 +2109,7 @@ int main()
// Access to struct member // Access to struct member
FindUsages find(src, doc, snapshot); FindUsages find(src, doc, snapshot);
find(sv); find(sv);
QCOMPARE(find.usages().size(), 18); QCOMPARE(find.usages().size(), 21);
QCOMPARE(find.usages().at(0).type, Usage::Type::Read); QCOMPARE(find.usages().at(0).type, Usage::Type::Read);
QCOMPARE(find.usages().at(1).type, Usage::Type::Declaration); QCOMPARE(find.usages().at(1).type, Usage::Type::Declaration);
QCOMPARE(find.usages().at(2).type, Usage::Type::WritableRef); QCOMPARE(find.usages().at(2).type, Usage::Type::WritableRef);
@@ -2122,6 +2128,9 @@ int main()
QCOMPARE(find.usages().at(15).type, Usage::Type::Read); QCOMPARE(find.usages().at(15).type, Usage::Type::Read);
QCOMPARE(find.usages().at(16).type, Usage::Type::Read); QCOMPARE(find.usages().at(16).type, Usage::Type::Read);
QCOMPARE(find.usages().at(17).type, Usage::Type::Read); QCOMPARE(find.usages().at(17).type, Usage::Type::Read);
QCOMPARE(find.usages().at(18).type, Usage::Type::Read);
QCOMPARE(find.usages().at(19).type, Usage::Type::Read);
QCOMPARE(find.usages().at(20).type, Usage::Type::Write);
Declaration * const sv2 = structS->memberAt(2)->asDeclaration(); Declaration * const sv2 = structS->memberAt(2)->asDeclaration();
QVERIFY(sv2); QVERIFY(sv2);
@@ -2138,7 +2147,7 @@ int main()
QCOMPARE(main->memberCount(), 1); QCOMPARE(main->memberCount(), 1);
Block * const block = main->memberAt(0)->asBlock(); Block * const block = main->memberAt(0)->asBlock();
QVERIFY(block); QVERIFY(block);
QCOMPARE(block->memberCount(), 13); QCOMPARE(block->memberCount(), 15);
// Access to pointer // Access to pointer
Declaration * const p = block->memberAt(1)->asDeclaration(); Declaration * const p = block->memberAt(1)->asDeclaration();
@@ -2204,12 +2213,18 @@ int main()
// Usages of struct type // Usages of struct type
find(structS); find(structS);
QCOMPARE(find.usages().size(), 5); QCOMPARE(find.usages().size(), 8);
QCOMPARE(find.usages().at(0).type, Usage::Type::Declaration); QCOMPARE(find.usages().at(0).type, Usage::Type::Declaration);
QCOMPARE(find.usages().at(1).type, Usage::Type::Other); QCOMPARE(find.usages().at(1).type, Usage::Type::Other);
QCOMPARE(find.usages().at(2).type, Usage::Type::Other); QCOMPARE(find.usages().at(2).type, Usage::Type::Other);
QCOMPARE(find.usages().at(3).type, Usage::Type::Other); QCOMPARE(find.usages().at(3).type, Usage::Type::Other);
QCOMPARE(find.usages().at(4).type, Usage::Type::Other); QCOMPARE(find.usages().at(4).type, Usage::Type::Other);
// These are conceptually questionable, as S is a type and thus we cannot "read from"
// or "write to" it. But it possibly matches the intuitive user expectation.
QCOMPARE(find.usages().at(5).type, Usage::Type::Read);
QCOMPARE(find.usages().at(6).type, Usage::Type::Read);
QCOMPARE(find.usages().at(7).type, Usage::Type::Write);
} }
QTEST_APPLESS_MAIN(tst_FindUsages) QTEST_APPLESS_MAIN(tst_FindUsages)