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

Restore the old behaviour when switching between function declaration/definition symbols.

Browse Source 
That is, we don't look at the column position anymore when searching
the function under cursor.
This commit is contained in:
Roberto Raggi
2010-08-17 14:30:11 +02:00
parent e8eea80c3f
commit 644544185f
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/cplusplus/CppDocument.h
View File

@@ -91,8 +91,8 @@ public:
QList<Macro> definedMacros() const QList<Macro> definedMacros() const
{ return _definedMacros; } { return _definedMacros; }
Symbol *lastVisibleSymbolAt(unsigned line, unsigned column) const; Symbol *lastVisibleSymbolAt(unsigned line, unsigned column = 0) const;
Scope *scopeAt(unsigned line, unsigned column); Scope *scopeAt(unsigned line, unsigned column = 0);
QByteArray source() const; QByteArray source() const;
void setSource(const QByteArray &source); void setSource(const QByteArray &source);

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

@@ -1074,19 +1074,13 @@ void CPPEditor::switchDeclarationDefinition()
int line = 0, positionInBlock = 0; int line = 0, positionInBlock = 0;
convertPosition(position(), &line, &positionInBlock); convertPosition(position(), &line, &positionInBlock);
Scope *scope = thisDocument->scopeAt(line, positionInBlock + 1);
Symbol *lastVisibleSymbol = thisDocument->lastVisibleSymbolAt(line, positionInBlock + 1); Symbol *lastVisibleSymbol = thisDocument->lastVisibleSymbolAt(line, positionInBlock + 1);
if (! lastVisibleSymbol)
return;
Scope *functionScope = 0; Function *functionScope = lastVisibleSymbol->asFunction();
if (scope->isFunction()) if (! functionScope)
functionScope = scope; functionScope = lastVisibleSymbol->enclosingFunction();
else
functionScope = scope->enclosingFunction();
if (! functionScope && lastVisibleSymbol) {
if (Function *def = lastVisibleSymbol->asFunction())
functionScope = def;
}
if (functionScope) { if (functionScope) {
LookupContext context(thisDocument, snapshot); LookupContext context(thisDocument, snapshot);