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

qmljs: improve handling of qml dialects

Browse Source 
Language::Enum -> QmlDialect
 * class instead of enum
 * moved Language specific operations to it (from Document)
 * nicer handling
QStringList -> PathsAndLanguages
 * store language along with path, to perform a correct scan and improve
   path handling

Change-Id: If69d35c63cfeb48aa670b51870916cd0c40f1916
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-07-22 19:06:44 +02:00
parent faa0e5b96c
commit 02bdf30f45
40 changed files with 752 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmljseditor/qmljsfindreferences.cpp
View File

@@ -812,14 +812,14 @@ static void find_helper(QFutureInterface<FindReferences::Usage> &future,
if (oldDoc && oldDoc->editorRevision() == it.value().second)
continue;
Language::Enum language;
Dialect language;
if (oldDoc)
language = oldDoc->language();
else
language = ModelManagerInterface::guessLanguageOfFile(fileName);
if (language == Language::NoLanguage) {
if (language == Dialect::NoLanguage) {
qCDebug(qmljsLog) << "NoLanguage in qmljsfindreferences.cpp find_helper for " << fileName;
language = Language::AnyLanguage;
language = Dialect::AnyLanguage;
}
Document::MutablePtr newDoc = snapshot.documentFromSource(