From e1a0f5abef4ea9c7b6fff827c054253cb65b7c40 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Wed, 16 Jun 2010 15:35:34 +0200
Subject: [PATCH] C++: Make 'follow symbol' work with forward declared classes.
If it encounters a forward declaration, it tries to find the class
declaration globally now.
Task-number: QTCREATORBUG-20
---
src/libs/cplusplus/CppDocument.cpp | 23 +++++++++++++++++++++++
src/libs/cplusplus/CppDocument.h | 1 +
src/libs/cplusplus/LookupContext.cpp | 3 ++-
src/plugins/cppeditor/cppeditor.cpp | 4 ++++
4 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index cd7c0feb589..16d3a69e784 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -793,3 +793,26 @@ Symbol *Snapshot::findMatchingDefinition(Symbol *symbol) const
return 0;
}
+
+Class *Snapshot::findMatchingClassDeclaration(Symbol *declaration) const
+{
+ if (! declaration->identifier())
+ return 0;
+
+ foreach (Document::Ptr doc, *this) {
+ if (! doc->control()->findIdentifier(declaration->identifier()->chars(),
+ declaration->identifier()->size()))
+ continue;
+
+ LookupContext context(doc, *this);
+
+ ClassOrNamespace *type = context.lookupType(declaration);
+ if (!type || type->symbols().count() != 1)
+ continue;
+
+ if (Class *c = type->symbols().first()->asClass())
+ return c;
+ }
+
+ return 0;
+}
diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h
index cfdd42c2442..cc1f9c2ff8c 100644
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -372,6 +372,7 @@ public:
const QString &fileName) const;
Symbol *findMatchingDefinition(Symbol *symbol) const;
+ Class *findMatchingClassDeclaration(Symbol *symbol) const;
private:
void simplified_helper(Document::Ptr doc, Snapshot *snapshot) const;
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 4e035dbca3a..83f118b449f 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -64,7 +64,8 @@ static void fullyQualifiedName_helper(Symbol *symbol, QList<const Name *> *names
names->append(symbol->name());
}
} else if (symbol->isObjCClass() || symbol->isObjCBaseClass() || symbol->isObjCProtocol()
- || symbol->isObjCForwardClassDeclaration() || symbol->isObjCForwardProtocolDeclaration()) {
+ || symbol->isObjCForwardClassDeclaration() || symbol->isObjCForwardProtocolDeclaration()
+ || symbol->isForwardClassDeclaration()) {
if (symbol->name())
names->append(symbol->name());
} else if (symbol->isFunction()) {
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 19c92b21a76..9471daeaee3 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -1315,6 +1315,10 @@ CPPEditor::Link CPPEditor::findLinkAt(const QTextCursor &cursor,
def = 0; // jump to declaration then.
}
+ if (symbol->isForwardClassDeclaration()) {
+ def = snapshot.findMatchingClassDeclaration(symbol);
+ }
+
link = linkToSymbol(def ? def : symbol);
link.begin = beginOfToken;
link.end = endOfToken;
--
GitLab