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

CppEditor: Support decl/def switch for conversion operators

Browse Source 
Fixes: QTCREATORBUG-21168
Change-Id: I515fe146a679e007c96fa8d23f1457dadf07db3c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-18 18:04:21 +01:00
parent b0dd6b748f
commit d3fafcde0f
7 changed files with 81 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/cpptools/symbolfinder.cpp
View File

@@ -58,6 +58,7 @@ class FindMatchingDefinition: public SymbolVisitor
{
Symbol *_declaration = nullptr;
const OperatorNameId *_oper = nullptr;
const ConversionNameId *_conv = nullptr;
const bool _strict;
QList<Hit> _result;
@@ -65,8 +66,10 @@ public:
explicit FindMatchingDefinition(Symbol *declaration, bool strict)
: _declaration(declaration), _strict(strict)
{
if (_declaration->name())
if (_declaration->name()) {
_oper = _declaration->name()->asOperatorNameId();
_conv = _declaration->name()->asConversionNameId();
}
}
const QList<Hit> result() const { return _result; }
@@ -75,10 +78,10 @@ public:
bool visit(Function *fun) override
{
if (_oper) {
if (_oper || _conv) {
if (const Name *name = fun->unqualifiedName()) {
if (_oper->match(name))
_result.append({fun, true});
if ((_oper && _oper->match(name)) || (_conv && _conv->match(name)))
_result.append({fun, true});
}
} else if (Function *decl = _declaration->type()->asFunctionType()) {
if (fun->match(decl)) {
@@ -181,13 +184,18 @@ Function *SymbolFinder::findMatchingDefinition(Symbol *declaration,
continue;
if (!id) {
if (!declaration->name())
const Name * const name = declaration->name();
if (!name)
continue;
const OperatorNameId *oper = declaration->name()->asOperatorNameId();
if (!oper)
continue;
if (!doc->control()->findOperatorNameId(oper->kind()))
if (const OperatorNameId * const oper = name->asOperatorNameId()) {
if (!doc->control()->findOperatorNameId(oper->kind()))
continue;
} else if (const ConversionNameId * const conv = name->asConversionNameId()) {
if (!doc->control()->findConversionNameId(conv->type()))
continue;
} else {
continue;
}
}
FindMatchingDefinition candidates(declaration, strict);