Implemented a simple(fast?) strategy to resolve macro references.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 9771328c5b..9a3022c577 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -57,6 +57,8 @@
 #include <cplusplus/TypeOfExpression.h>
 #include <cplusplus/MatchingText.h>
 #include <cplusplus/BackwardsScanner.h>
+#include <cplusplus/FastPreprocessor.h>
+
 #include <cpptools/cppmodelmanagerinterface.h>
 
 #include <coreplugin/icore.h>
@@ -2064,10 +2066,13 @@ 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);
-        doc->check();
 
-        snapshot = source.snapshot;
+        FastMacroResolver fastMacroResolver(snapshot);
+        doc->control()->setMacroResolver(&fastMacroResolver);
+        doc->check();
+        doc->control()->setMacroResolver(0);
     }
 
     Control *control = doc->control();