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

CPlusPlus: Support completion of list iterators

Browse Source 
Fixes: QTCREATORBUG-30608
Change-Id: I169efe675e13540ecc5fbbd6b15dd13d8522db7d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2024-04-24 11:25:00 +02:00
parent 87193a0311
commit caf31c4fe9
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/cplusplus/ResolveExpression.cpp
View File

@@ -1062,6 +1062,8 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
} }
typedefsResolver.resolve(&ty, &scope, r.binding()); typedefsResolver.resolve(&ty, &scope, r.binding());
if (auto ref = ty->asReferenceType()) // deref if needed
ty = ref->elementType();
if (Q_UNLIKELY(debug)) if (Q_UNLIKELY(debug))
qDebug() << "- after typedef resolving:" << oo.prettyType(ty); qDebug() << "- after typedef resolving:" << oo.prettyType(ty);
@@ -1082,6 +1084,9 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
if (ClassOrNamespace *binding = findClass(type, scope)) if (ClassOrNamespace *binding = findClass(type, scope))
return binding; return binding;
if (ClassOrNamespace *binding = findClass(type, r.scope())) // local classes and structs
return binding;
} else { } else {
ClassOrNamespace *binding ClassOrNamespace *binding
= findClassForTemplateParameterInExpressionScope(r.binding(), = findClassForTemplateParameterInExpressionScope(r.binding(),
@@ -1176,6 +1181,9 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
if (ClassOrNamespace *binding = findClass(ty, scope, enclosingBinding)) if (ClassOrNamespace *binding = findClass(ty, scope, enclosingBinding))
return binding; return binding;
if (ClassOrNamespace *binding = findClass(ty, r.scope())) // local classes and structs
return binding;
} }
} }

10
src/plugins/cppeditor/cppcompletion_test.cpp
View File

@@ -2889,6 +2889,16 @@ void CompletionTest::testCompletionMemberAccessOperator_data()
) << _("p->") << QStringList({"S", "m"}) ) << _("p->") << QStringList({"S", "m"})
<< false << false
<< false; << false;
QTest::newRow("dot to arrow: template + reference + double typedef")
<< _("template <typename T> struct C {\n"
" using ref = T &;\n"
" ref operator[](int i);\n"
"};\n"
"struct S { int m; };\n"
"template<typename T> using CS = C<T>;\n"
"CS<S *> v;\n"
"@\n")
<< _("v[0].") << QStringList({"S", "m"}) << false << true;
} }
} // namespace CppEditor::Internal } // namespace CppEditor::Internal