From fbd624d170f280432b0106482745f99bb6088f6e Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 26 Jan 2010 12:09:07 +0100
Subject: [PATCH] Update the ranges also for recovered ASTs.
---
src/plugins/qmljseditor/qmljseditor.cpp | 26 ++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 19c68c46630..969cff21e43 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -535,26 +535,30 @@ void QmlJSTextEditor::onDocumentUpdated(QmlJS::Document::Ptr doc)
m_idsRevision = document()->revision();
m_ids = updateIds(doc->qmlProgram());
- if (doc->isParsedCorrectly()) {
- // create the ranges
+ if (doc->ast()) {
+ // got a correctly parsed (or recovered) file.
+
+ // create the ranges and update the semantic info.
CreateRanges createRanges;
SemanticInfo sem;
sem.document = doc;
sem.ranges = createRanges(document(), doc);
m_semanticInfo = sem;
- FindDeclarations findDeclarations;
- m_declarations = findDeclarations(doc->ast());
+ if (doc->isParsedCorrectly()) {
+ FindDeclarations findDeclarations;
+ m_declarations = findDeclarations(doc->ast());
- QStringList items;
- items.append(tr("<Select Symbol>"));
+ QStringList items;
+ items.append(tr("<Select Symbol>"));
- foreach (Declaration decl, m_declarations)
- items.append(decl.text);
+ foreach (Declaration decl, m_declarations)
+ items.append(decl.text);
- m_methodCombo->clear();
- m_methodCombo->addItems(items);
- updateMethodBoxIndex();
+ m_methodCombo->clear();
+ m_methodCombo->addItems(items);
+ updateMethodBoxIndex();
+ }
}
QList<QTextEdit::ExtraSelection> selections;
--
GitLab