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

Check the file's mimetype before creating QML/JS documents.

Browse Source
This commit is contained in:
Roberto Raggi
2010-02-15 14:07:35 +01:00
parent 4b76d828f7
commit 33b4b15a60
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,6 +148,18 @@ void ModelManager::parse(QFutureInterface<void> &future,
future.setProgressValue(i);
const QString fileName = files.at(i);
const QFileInfo fileInfo(fileName);
Core::MimeType fileMimeTy = db->findByFile(fileInfo);
bool isQmlFile = true;
if (matchesMimeType(fileMimeTy, jsSourceTy))
isQmlFile = false;
else if (! matchesMimeType(fileMimeTy, qmlSourceTy))
continue; // skip it. it's not a QML or a JS file.
QString contents;
int documentRevision = 0;
@@ -169,15 +181,10 @@ void ModelManager::parse(QFutureInterface<void> &future,
doc->setDocumentRevision(documentRevision);
doc->setSource(contents);
const QFileInfo fileInfo(fileName);
Core::MimeType fileMimeTy = db->findByFile(fileInfo);
if (matchesMimeType(fileMimeTy, jsSourceTy))
doc->parseJavaScript();
else if (matchesMimeType(fileMimeTy, qmlSourceTy))
if (isQmlFile)
doc->parseQml();
else
qWarning() << "Don't know how to treat" << fileName;
doc->parseJavaScript();
modelManager->emitDocumentUpdated(doc);
}