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

CppTools: Show function args in current document filter

Browse Source 
Regression introduced by commit 190fb44.

Change-Id: Ibd47b6d316e5ae976fb448aad5062eb5887f10e6
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-09-23 10:51:39 +02:00
parent 4979e8ad37
commit 8d6ea45126
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cpptools/cppcurrentdocumentfilter.cpp
View File

@@ -98,8 +98,10 @@ QList<Locator::FilterEntry> CppCurrentDocumentFilter::matchesFor(QFutureInterfac
QVariant id = qVariantFromValue(info); QVariant id = qVariantFromValue(info);
QString name = matchString; QString name = matchString;
QString extraInfo = info.symbolScope; QString extraInfo = info.symbolScope;
if (info.type == ModelItemInfo::Method) if (info.type == ModelItemInfo::Method) {
info.unqualifiedNameAndScope(matchString, &name, &extraInfo); if (info.unqualifiedNameAndScope(matchString, &name, &extraInfo))
name += info.symbolType;
}
Locator::FilterEntry filterEntry(this, name, id, info.icon); Locator::FilterEntry filterEntry(this, name, id, info.icon);
filterEntry.extraInfo = extraInfo; filterEntry.extraInfo = extraInfo;

38
src/plugins/cpptools/cpplocatorfilter_test.cpp
View File

@@ -252,35 +252,35 @@ void CppToolsPlugin::test_cpplocatorfilters_CppCurrentDocumentFilter()
<< ResultData(_("int V1"), _("MyEnum")) << ResultData(_("int V1"), _("MyEnum"))
<< ResultData(_("int V2"), _("MyEnum")) << ResultData(_("int V2"), _("MyEnum"))
<< ResultData(_("MyClass"), _("")) << ResultData(_("MyClass"), _(""))
<< ResultData(_("MyClass"), _("MyClass")) << ResultData(_("MyClass()"), _("MyClass"))
<< ResultData(_("functionDeclaredOnly"), _("MyClass")) << ResultData(_("functionDeclaredOnly()"), _("MyClass"))
<< ResultData(_("functionDefinedInClass"), _("MyClass")) << ResultData(_("functionDefinedInClass(bool, int)"), _("MyClass"))
<< ResultData(_("functionDefinedOutSideClass"), _("MyClass")) << ResultData(_("functionDefinedOutSideClass(char)"), _("MyClass"))
<< ResultData(_("functionDefinedOutSideClass"), _("MyClass")) << ResultData(_("functionDefinedOutSideClass(char)"), _("MyClass"))
<< ResultData(_("int myVariable"), _("MyNamespace")) << ResultData(_("int myVariable"), _("MyNamespace"))
<< ResultData(_("myFunction"), _("MyNamespace")) << ResultData(_("myFunction(bool, int)"), _("MyNamespace"))
<< ResultData(_("MyEnum"), _("MyNamespace")) << ResultData(_("MyEnum"), _("MyNamespace"))
<< ResultData(_("int V1"), _("MyNamespace::MyEnum")) << ResultData(_("int V1"), _("MyNamespace::MyEnum"))
<< ResultData(_("int V2"), _("MyNamespace::MyEnum")) << ResultData(_("int V2"), _("MyNamespace::MyEnum"))
<< ResultData(_("MyClass"), _("MyNamespace")) << ResultData(_("MyClass"), _("MyNamespace"))
<< ResultData(_("MyClass"), _("MyNamespace::MyClass")) << ResultData(_("MyClass()"), _("MyNamespace::MyClass"))
<< ResultData(_("functionDeclaredOnly"), _("MyNamespace::MyClass")) << ResultData(_("functionDeclaredOnly()"), _("MyNamespace::MyClass"))
<< ResultData(_("functionDefinedInClass"), _("MyNamespace::MyClass")) << ResultData(_("functionDefinedInClass(bool, int)"), _("MyNamespace::MyClass"))
<< ResultData(_("functionDefinedOutSideClass"), _("MyNamespace::MyClass")) << ResultData(_("functionDefinedOutSideClass(char)"), _("MyNamespace::MyClass"))
<< ResultData(_("functionDefinedOutSideClassAndNamespace"), _("MyNamespace::MyClass")) << ResultData(_("functionDefinedOutSideClassAndNamespace(float)"), _("MyNamespace::MyClass"))
<< ResultData(_("functionDefinedOutSideClass"), _("MyNamespace::MyClass")) << ResultData(_("functionDefinedOutSideClass(char)"), _("MyNamespace::MyClass"))
<< ResultData(_("functionDefinedOutSideClassAndNamespace"), _("MyNamespace::MyClass")) << ResultData(_("functionDefinedOutSideClassAndNamespace(float)"), _("MyNamespace::MyClass"))
<< ResultData(_("int myVariable"), _("<anonymous namespace>")) << ResultData(_("int myVariable"), _("<anonymous namespace>"))
<< ResultData(_("myFunction"), _("<anonymous namespace>")) << ResultData(_("myFunction(bool, int)"), _("<anonymous namespace>"))
<< ResultData(_("MyEnum"), _("<anonymous namespace>")) << ResultData(_("MyEnum"), _("<anonymous namespace>"))
<< ResultData(_("int V1"), _("<anonymous namespace>::MyEnum")) << ResultData(_("int V1"), _("<anonymous namespace>::MyEnum"))
<< ResultData(_("int V2"), _("<anonymous namespace>::MyEnum")) << ResultData(_("int V2"), _("<anonymous namespace>::MyEnum"))
<< ResultData(_("MyClass"), _("<anonymous namespace>")) << ResultData(_("MyClass"), _("<anonymous namespace>"))
<< ResultData(_("MyClass"), _("<anonymous namespace>::MyClass")) << ResultData(_("MyClass()"), _("<anonymous namespace>::MyClass"))
<< ResultData(_("functionDeclaredOnly"), _("<anonymous namespace>::MyClass")) << ResultData(_("functionDeclaredOnly()"), _("<anonymous namespace>::MyClass"))
<< ResultData(_("functionDefinedInClass"), _("<anonymous namespace>::MyClass")) << ResultData(_("functionDefinedInClass(bool, int)"), _("<anonymous namespace>::MyClass"))
<< ResultData(_("functionDefinedOutSideClass"), _("<anonymous namespace>::MyClass")) << ResultData(_("functionDefinedOutSideClass(char)"), _("<anonymous namespace>::MyClass"))
<< ResultData(_("functionDefinedOutSideClass"), _("<anonymous namespace>::MyClass")) << ResultData(_("functionDefinedOutSideClass(char)"), _("<anonymous namespace>::MyClass"))
<< ResultData(_("main()"), _("")) << ResultData(_("main()"), _(""))
; ;

4
src/plugins/cpptools/searchsymbols.h
View File

@@ -94,7 +94,7 @@ struct CPPTOOLS_EXPORT ModelItemInfo
: symbolScope + QLatin1String("::") + symbolName; : symbolScope + QLatin1String("::") + symbolName;
} }
void unqualifiedNameAndScope(const QString &defaultName, QString *name, QString *scope) const bool unqualifiedNameAndScope(const QString &defaultName, QString *name, QString *scope) const
{ {
*name = defaultName; *name = defaultName;
*scope = symbolScope; *scope = symbolScope;
@@ -103,7 +103,9 @@ struct CPPTOOLS_EXPORT ModelItemInfo
if (colonColonPosition != -1) { if (colonColonPosition != -1) {
*name = qualifiedName.mid(colonColonPosition + 2); *name = qualifiedName.mid(colonColonPosition + 2);
*scope = qualifiedName.left(colonColonPosition); *scope = qualifiedName.left(colonColonPosition);
return true;
} }
return false;
} }
static QString representDeclaration(const QString &name, const QString &type) static QString representDeclaration(const QString &name, const QString &type)