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

Use the document in the snapshot when available.

Browse Source
This commit is contained in:
Roberto Raggi
2010-05-25 10:47:49 +02:00
parent 3141edd2ab
commit 2a0f901e16
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/cplusplus/CheckUndefinedSymbols.cpp
View File

@@ -42,10 +42,10 @@
using namespace CPlusPlus;
CheckUndefinedSymbols::CheckUndefinedSymbols(Document::Ptr doc, const Snapshot &snapshot)
: ASTVisitor(doc->translationUnit()), _context(doc, snapshot)
CheckUndefinedSymbols::CheckUndefinedSymbols(TranslationUnit *unit, const LookupContext &context)
: ASTVisitor(unit), _context(context)
{
_fileName = doc->fileName();
_fileName = context.thisDocument()->fileName();
}
CheckUndefinedSymbols::~CheckUndefinedSymbols()

2
src/libs/cplusplus/CheckUndefinedSymbols.h
View File

@@ -39,7 +39,7 @@ namespace CPlusPlus {
class CPLUSPLUS_EXPORT CheckUndefinedSymbols: protected ASTVisitor
{
public:
CheckUndefinedSymbols(Document::Ptr doc, const Snapshot &snapshot);
CheckUndefinedSymbols(TranslationUnit *unit, const LookupContext &context);
virtual ~CheckUndefinedSymbols();
QList<Document::DiagnosticMessage> operator()(AST *ast);

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

@@ -1997,15 +1997,24 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source)
}
if (! doc) {
const QByteArray preprocessedCode = source.snapshot.preprocessedCode(source.code, source.fileName);
snapshot = source.snapshot;
doc = source.snapshot.documentFromSource(preprocessedCode, source.fileName);
const QByteArray preprocessedCode = snapshot.preprocessedCode(source.code, source.fileName);
doc = snapshot.documentFromSource(preprocessedCode, source.fileName);
doc->check();
// ### check undefined symbols.
CheckUndefinedSymbols checkUndefinedSymbols(doc, snapshot);
diagnosticMessages = checkUndefinedSymbols(doc->translationUnit()->ast());
Document::Ptr documentInSnapshot = snapshot.document(source.fileName);
if (! documentInSnapshot) {
// use the newly parsed document.
documentInSnapshot = doc;
}
LookupContext context(doc, snapshot);
if (TranslationUnit *unit = doc->translationUnit()) {
CheckUndefinedSymbols checkUndefinedSymbols(unit, context);
diagnosticMessages = checkUndefinedSymbols(unit->ast());
}
}
TranslationUnit *translationUnit = doc->translationUnit();