aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cpptools/searchsymbols.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2014-07-16 16:35:03 +0200
committerNikolai Kosjar <nikolai.kosjar@digia.com>2014-07-24 11:38:54 +0200
commit3a242495fe28811c535fab909db5aa42dc68873b (patch)
tree8612d3bb40e3b1a43c6198cf0d880d26f88b5b72 /src/plugins/cpptools/searchsymbols.cpp
parentb8adc786157b81b0400cf701d02694a380d3e780 (diff)
ObjC++: also index ObjC symbols.
@classes, @protocols, @properties and -methods (and +methods) will now show up in the locator. Change-Id: I33f904c456c321fc80b8aba7ff52d5f1207c58be Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cpptools/searchsymbols.cpp')
-rw-r--r--src/plugins/cpptools/searchsymbols.cpp70
1 files changed, 45 insertions, 25 deletions
diff --git a/src/plugins/cpptools/searchsymbols.cpp b/src/plugins/cpptools/searchsymbols.cpp
index 0fe83a1a41..e142d057aa 100644
--- a/src/plugins/cpptools/searchsymbols.cpp
+++ b/src/plugins/cpptools/searchsymbols.cpp
@@ -105,11 +105,7 @@ bool SearchSymbols::visit(Enum *symbol)
bool SearchSymbols::visit(Function *symbol)
{
- if (!(symbolsToSearchFor & SymbolSearcher::Functions) || !symbol->name())
- return false;
- QString name = overview.prettyName(symbol->name());
- QString type = overview.prettyType(symbol->type());
- addChildItem(name, type, _scope, IndexItem::Function, symbol);
+ processFunction(symbol);
return false;
}
@@ -130,10 +126,12 @@ bool SearchSymbols::visit(Declaration *symbol)
// if we're searching for functions, still allow signal declarations to show up.
if (symbolsToSearchFor & SymbolSearcher::Functions) {
Function *funTy = symbol->type()->asFunctionType();
- if (!funTy)
- return false;
- if (!funTy->isSignal())
+ if (!funTy) {
+ if (!symbol->type()->asObjCMethodType())
+ return false;
+ } else if (!funTy->isSignal()) {
return false;
+ }
} else {
return false;
}
@@ -153,19 +151,7 @@ bool SearchSymbols::visit(Declaration *symbol)
bool SearchSymbols::visit(Class *symbol)
{
- QString name = overview.prettyName(symbol->name());
-
- IndexItem::Ptr newParent;
- if (symbolsToSearchFor & SymbolSearcher::Classes)
- newParent = addChildItem(name, QString(), _scope, IndexItem::Class, symbol);
- if (!newParent)
- newParent = _parent;
- ScopedIndexItemPtr parentRaii(_parent, newParent);
-
- QString newScope = scopedSymbolName(name, symbol);
- ScopedScope scopeRaii(_scope, newScope);
- for (unsigned i = 0, ei = symbol->memberCount(); i != ei; ++i)
- accept(symbol->memberAt(i));
+ processClass(symbol);
return false;
}
@@ -225,8 +211,10 @@ bool SearchSymbols::visit(CPlusPlus::ObjCBaseProtocol *)
return false;
}
-bool SearchSymbols::visit(CPlusPlus::ObjCClass *)
+bool SearchSymbols::visit(CPlusPlus::ObjCClass *symbol)
{
+ processClass(symbol);
+
return false;
}
@@ -235,8 +223,10 @@ bool SearchSymbols::visit(CPlusPlus::ObjCForwardClassDeclaration *)
return false;
}
-bool SearchSymbols::visit(CPlusPlus::ObjCProtocol *)
+bool SearchSymbols::visit(CPlusPlus::ObjCProtocol *symbol)
{
+ processClass(symbol);
+
return false;
}
@@ -245,13 +235,15 @@ bool SearchSymbols::visit(CPlusPlus::ObjCForwardProtocolDeclaration *)
return false;
}
-bool SearchSymbols::visit(CPlusPlus::ObjCMethod *)
+bool SearchSymbols::visit(CPlusPlus::ObjCMethod *symbol)
{
+ processFunction(symbol);
return false;
}
-bool SearchSymbols::visit(CPlusPlus::ObjCPropertyDeclaration *)
+bool SearchSymbols::visit(CPlusPlus::ObjCPropertyDeclaration *symbol)
{
+ processFunction(symbol);
return false;
}
@@ -315,3 +307,31 @@ IndexItem::Ptr SearchSymbols::addChildItem(const QString &symbolName, const QStr
_parent->addChild(newItem);
return newItem;
}
+
+template<class T>
+void SearchSymbols::processClass(T *clazz)
+{
+ QString name = overview.prettyName(clazz->name());
+
+ IndexItem::Ptr newParent;
+ if (symbolsToSearchFor & SymbolSearcher::Classes)
+ newParent = addChildItem(name, QString(), _scope, IndexItem::Class, clazz);
+ if (!newParent)
+ newParent = _parent;
+ ScopedIndexItemPtr parentRaii(_parent, newParent);
+
+ QString newScope = scopedSymbolName(name, clazz);
+ ScopedScope scopeRaii(_scope, newScope);
+ for (unsigned i = 0, ei = clazz->memberCount(); i != ei; ++i)
+ accept(clazz->memberAt(i));
+}
+
+template<class T>
+void SearchSymbols::processFunction(T *func)
+{
+ if (!(symbolsToSearchFor & SymbolSearcher::Functions) || !func->name())
+ return;
+ QString name = overview.prettyName(func->name());
+ QString type = overview.prettyType(func->type());
+ addChildItem(name, type, _scope, IndexItem::Function, func);
+}