diff options
author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-08-31 10:39:07 +0200 |
---|---|---|
committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-08-31 10:39:07 +0200 |
commit | f3f3b96c8562345e42220c222a8f56c2e77bc32c (patch) | |
tree | f9de9b2891468bee4500141f0d0e1cbe92c7bc92 /src/libs | |
parent | 2e8ec2f9e61a855cec878a00ca0156d1ec49c484 (diff) | |
download | qt-creator-f3f3b96c8562345e42220c222a8f56c2e77bc32c.tar.gz |
QmlJS: Improve performance by avoiding two links in SemanticHighlighter.
Reviewed-by: Roberto Raggi
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 5 | ||||
-rw-r--r-- | src/libs/qmljs/qmljscheck.h | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index ae6ed1b335..96d8d5e87c 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -154,10 +154,10 @@ public: } // end of anonymous namespace -Check::Check(Document::Ptr doc, const Snapshot &snapshot, const QStringList &importPaths) +Check::Check(Document::Ptr doc, const Snapshot &snapshot, const Context *linkedContextNoScope) : _doc(doc) , _snapshot(snapshot) - , _link(&_context, doc, snapshot, importPaths) + , _context(*linkedContextNoScope) , _scopeBuilder(doc, &_context) , _ignoreTypeErrors(false) { @@ -171,7 +171,6 @@ QList<DiagnosticMessage> Check::operator()() { _messages.clear(); Node::accept(_doc->ast(), this); - _messages.append(_link.diagnosticMessages()); return _messages; } diff --git a/src/libs/qmljs/qmljscheck.h b/src/libs/qmljs/qmljscheck.h index 918d62fd58..3015987dc7 100644 --- a/src/libs/qmljs/qmljscheck.h +++ b/src/libs/qmljs/qmljscheck.h @@ -32,7 +32,6 @@ #include <qmljs/qmljsdocument.h> #include <qmljs/qmljsinterpreter.h> -#include <qmljs/qmljslink.h> #include <qmljs/qmljsscopebuilder.h> #include <qmljs/parser/qmljsastvisitor_p.h> @@ -46,7 +45,7 @@ class QMLJS_EXPORT Check: protected AST::Visitor Q_DECLARE_TR_FUNCTIONS(QmlJS::Check) public: - Check(Document::Ptr doc, const Snapshot &snapshot, const QStringList &importPaths); + Check(Document::Ptr doc, const Snapshot &snapshot, const Interpreter::Context *linkedContextNoScope); virtual ~Check(); QList<DiagnosticMessage> operator()(); @@ -72,7 +71,6 @@ private: Snapshot _snapshot; Interpreter::Context _context; - Link _link; ScopeBuilder _scopeBuilder; QList<DiagnosticMessage> _messages; |