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

Try to get the right overload when switching from a declaration to its definition.

Browse Source
This commit is contained in:
Roberto Raggi
2010-12-10 10:47:57 +01:00
parent 63138eb808
commit 3a4765e276
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -1108,21 +1108,30 @@ void CPPEditor::switchDeclarationDefinition()
if (! lastVisibleSymbol) if (! lastVisibleSymbol)
return; return;
Function *functionScope = lastVisibleSymbol->asFunction(); Function *function = lastVisibleSymbol->asFunction();
if (! functionScope) if (! function)
functionScope = lastVisibleSymbol->enclosingFunction(); function = lastVisibleSymbol->enclosingFunction();
if (functionScope) { if (function) {
LookupContext context(thisDocument, snapshot); LookupContext context(thisDocument, snapshot);
Function *functionDefinition = functionScope->asFunction(); Function *functionDefinition = function->asFunction();
ClassOrNamespace *binding = context.lookupType(functionDefinition);
const QList<LookupItem> declarations = context.lookup(functionDefinition->name(), functionDefinition->enclosingScope()); const QList<LookupItem> declarations = context.lookup(functionDefinition->name(), functionDefinition->enclosingScope());
QList<Symbol *> best;
foreach (const LookupItem &r, declarations) { foreach (const LookupItem &r, declarations) {
Symbol *decl = r.declaration(); if (Symbol *decl = r.declaration()) {
// TODO: check decl. if (Function *funTy = decl->type()->asFunctionType()) {
openCppEditorAt(linkToSymbol(decl)); if (funTy->isEqualTo(function) && decl != function && binding == r.binding())
break; best.prepend(decl);
else
best.append(decl);
} }
}
}
if (! best.isEmpty())
openCppEditorAt(linkToSymbol(best.first()));
} else if (lastVisibleSymbol && lastVisibleSymbol->isDeclaration() && lastVisibleSymbol->type()->isFunctionType()) { } else if (lastVisibleSymbol && lastVisibleSymbol->isDeclaration() && lastVisibleSymbol->type()->isFunctionType()) {
if (Symbol *def = snapshot.findMatchingDefinition(lastVisibleSymbol)) if (Symbol *def = snapshot.findMatchingDefinition(lastVisibleSymbol))