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

QmlJS: Move SemanticInfo from qmljseditor to qmljstools

Browse Source 
This will allow us to remove the qmljsinspector->qmljseditor
dependency.

Change-Id: I234cf8645edb614e8b1f559a0f9bb6d43e2254c3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Kai Koehne
2012-04-12 15:51:56 +02:00
parent ae394dfb20
commit 04ef376637
13 changed files with 392 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmljseditor/qmljssemanticinfoupdater.cpp
View File

@@ -102,7 +102,7 @@ void SemanticInfoUpdater::run()
if (done)
break;
const SemanticInfo info = makeNewSemanticInfo(doc, snapshot);
const QmlJSTools::SemanticInfo info = makeNewSemanticInfo(doc, snapshot);
m_mutex.lock();
const bool cancelledOrNewData = m_wasCancelled || m_sourceDocument;
@@ -115,11 +115,11 @@ void SemanticInfoUpdater::run()
}
}
SemanticInfo SemanticInfoUpdater::makeNewSemanticInfo(const QmlJS::Document::Ptr &doc, const QmlJS::Snapshot &snapshot)
QmlJSTools::SemanticInfo SemanticInfoUpdater::makeNewSemanticInfo(const QmlJS::Document::Ptr &doc, const QmlJS::Snapshot &snapshot)
{
using namespace QmlJS;
SemanticInfo semanticInfo;
QmlJSTools::SemanticInfo semanticInfo;
semanticInfo.document = doc;
semanticInfo.snapshot = snapshot;
@@ -129,7 +129,7 @@ SemanticInfo SemanticInfoUpdater::makeNewSemanticInfo(const QmlJS::Document::Ptr
semanticInfo.context = link(doc, &semanticInfo.semanticMessages);
ScopeChain *scopeChain = new ScopeChain(doc, semanticInfo.context);
semanticInfo.m_rootScopeChain = QSharedPointer<const ScopeChain>(scopeChain);
semanticInfo.setRootScopeChain(QSharedPointer<const ScopeChain>(scopeChain));
if (doc->language() == Document::JsonLanguage) {
Utils::JsonSchema *schema =