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

Handle ctor-initializers in the LookupContext.

Browse Source
This commit is contained in:
Roberto Raggi
2009-09-29 12:46:42 +02:00
parent 0ed9043c34
commit 6b4db9e674
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/cplusplus/LookupContext.cpp
View File

@@ -276,7 +276,12 @@ QList<Scope *> LookupContext::buildVisibleScopes()
QList<Scope *> scopes; QList<Scope *> scopes;
if (_symbol) { if (_symbol) {
for (Scope *scope = _symbol->scope(); scope; scope = scope->enclosingScope()) { Scope *scope = _symbol->scope();
if (Function *fun = _symbol->asFunction())
scope = fun->members(); // handle ctor initializers.
for (; scope; scope = scope->enclosingScope()) {
if (scope == _thisDocument->globalSymbols()) if (scope == _thisDocument->globalSymbols())
break; break;

9
src/plugins/cpptools/cppcodecompletion.cpp
View File

@@ -817,11 +817,10 @@ int CppCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
const Snapshot snapshot = m_manager->snapshot(); const Snapshot snapshot = m_manager->snapshot();
if (Document::Ptr thisDocument = snapshot.value(fileName)) { if (Document::Ptr thisDocument = snapshot.value(fileName)) {
Symbol *symbol = thisDocument->findSymbolAt(line, column); Symbol *lastVisibleSymbol = thisDocument->findSymbolAt(line, column);
typeOfExpression.setSnapshot(m_manager->snapshot()); typeOfExpression.setSnapshot(m_manager->snapshot());
QList<TypeOfExpression::Result> resolvedTypes = typeOfExpression(expression, thisDocument, symbol, QList<TypeOfExpression::Result> resolvedTypes = typeOfExpression(expression, thisDocument, lastVisibleSymbol,
TypeOfExpression::Preprocess); TypeOfExpression::Preprocess);
LookupContext context = typeOfExpression.lookupContext(); LookupContext context = typeOfExpression.lookupContext();
@@ -847,7 +846,7 @@ int CppCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
m_completionOperator == T_SLOT)) { m_completionOperator == T_SLOT)) {
// Apply signal/slot completion on 'this' // Apply signal/slot completion on 'this'
expression = QLatin1String("this"); expression = QLatin1String("this");
resolvedTypes = typeOfExpression(expression, thisDocument, symbol); resolvedTypes = typeOfExpression(expression, thisDocument, lastVisibleSymbol);
context = typeOfExpression.lookupContext(); context = typeOfExpression.lookupContext();
} }
@@ -883,7 +882,7 @@ int CppCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
// Resolve the type of this expression // Resolve the type of this expression
QList<TypeOfExpression::Result> results = QList<TypeOfExpression::Result> results =
typeOfExpression(baseExpression, thisDocument, symbol, TypeOfExpression::Preprocess); typeOfExpression(baseExpression, thisDocument, lastVisibleSymbol, TypeOfExpression::Preprocess);
// If it's a class, add completions for the constructors // If it's a class, add completions for the constructors
foreach (const TypeOfExpression::Result &result, results) { foreach (const TypeOfExpression::Result &result, results) {