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

QmlJS: Don't use full mime type detection to decide between qml/js.

Browse Source 
Determining the mime type is too expensive - and for deciding between
qml and js files comparing suffixes is sufficient.

Reviewed-by: Friedemann Kleint
This commit is contained in:
Christian Kamm
2010-11-23 12:49:50 +01:00
parent 2cbe7a3655
commit 8f27c43877
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -367,6 +367,15 @@ static void findNewLibraryImports(const Document::Ptr &doc, const Snapshot &snap
}
}
static bool suffixMatches(const QString &fileName, const Core::MimeType &mimeType)
{
foreach (const QString &suffix, mimeType.suffixes()) {
if (fileName.endsWith(suffix, Qt::CaseInsensitive))
return true;
}
return false;
}
void ModelManager::parse(QFutureInterface<void> &future,
WorkingCopy workingCopy,
QStringList files,
@@ -395,19 +404,13 @@ void ModelManager::parse(QFutureInterface<void> &future,
const QString fileName = files.at(i);
const QFileInfo fileInfo(fileName);
Core::MimeType fileMimeTy;
bool isQmlFile = true;
if (db) {
fileMimeTy = db->findByFile(fileInfo);
if (matchesMimeType(fileMimeTy, jsSourceTy))
if (suffixMatches(fileName, jsSourceTy)) {
isQmlFile = false;
else if (! matchesMimeType(fileMimeTy, qmlSourceTy))
} else if (! suffixMatches(fileName, qmlSourceTy)) {
continue; // skip it. it's not a QML or a JS file.
}
} else {
if (fileName.contains(QLatin1String(".js"), Qt::CaseInsensitive))
isQmlFile = false;