summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2010-02-02 10:47:07 +0100
committerRoberto Raggi <roberto.raggi@nokia.com>2010-02-02 11:14:30 +0100
commit4bb0e85cfe22a97f1fe78b953baae19e37796bd6 (patch)
treea3f488062c97bac286124c1d3de319755135dd1b /src
parent53d1eba3f7b2e3fcb70bb7b214a1eb21755684de (diff)
downloadqt-creator-4bb0e85cfe22a97f1fe78b953baae19e37796bd6.tar.gz
Cleanup
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qmljseditor/qmlcodecompletion.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/qmljseditor/qmlcodecompletion.cpp b/src/plugins/qmljseditor/qmlcodecompletion.cpp
index 10dedc173d..2d6340de71 100644
--- a/src/plugins/qmljseditor/qmlcodecompletion.cpp
+++ b/src/plugins/qmljseditor/qmlcodecompletion.cpp
@@ -616,11 +616,9 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
m_completions.clear();
- SemanticInfo semanticInfo = edit->semanticInfo();
+ const SemanticInfo semanticInfo = edit->semanticInfo();
const QmlJS::Snapshot snapshot = semanticInfo.snapshot;
- Document::Ptr qmlDocument = semanticInfo.document;
- if (qmlDocument.isNull())
- return -1;
+ const Document::Ptr qmlDocument = semanticInfo.document;
const QFileInfo currentFileInfo(fileName);
@@ -635,7 +633,7 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
// Set up the current scope chain.
Interpreter::ObjectValue *scope = interp.globalObject();
- if (isQmlFile) {
+ if (isQmlFile && qmlDocument) {
AST::UiObjectMember *declaringMember = semanticInfo.declaringMember(editor->position());
scope = Bind::scopeChainAt(qmlDocument, snapshot, &interp, declaringMember);
}