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

QmlJSEditor: Fix file/directory imports for qml files not in a project.

Browse Source 
Reviewed-by: Roberto Raggi
This commit is contained in:
Christian Kamm
2010-03-31 14:55:05 +02:00
parent 107ad1cadf
commit 9408378a24
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -749,12 +749,11 @@ static void appendExtraSelectionsForMessages(
void QmlJSTextEditor::onDocumentUpdated(QmlJS::Document::Ptr doc)
{
if (file()->fileName() != doc->fileName()) {
return;
}
if (doc->documentRevision() != document()->revision()) {
// got an outdated document.
if (file()->fileName() != doc->fileName()
|| doc->documentRevision() != document()->revision()) {
// didn't get the currently open, or an up to date document.
// trigger a semantic rehighlight anyway, after a time
updateDocument();
return;
}
@@ -764,6 +763,7 @@ void QmlJSTextEditor::onDocumentUpdated(QmlJS::Document::Ptr doc)
const SemanticHighlighter::Source source = currentSource(/*force = */ true);
m_semanticHighlighter->rehighlight(source);
} else {
// show parsing errors
QList<QTextEdit::ExtraSelection> selections;
appendExtraSelectionsForMessages(&selections, doc->diagnosticMessages(), document());
setExtraSelections(CodeWarningsSelection, selections);