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

Some refactoring needed to create ranges for JavaScript functions.

Browse Source
This commit is contained in:
Roberto Raggi
2010-02-02 16:36:14 +01:00
parent 03fa188b41
commit 14ffb1e465
8 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmljseditor/qmlcodecompletion.cpp
View File

@@ -618,7 +618,7 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
const SemanticInfo semanticInfo = edit->semanticInfo();
const QmlJS::Snapshot snapshot = semanticInfo.snapshot;
const Document::Ptr qmlDocument = semanticInfo.document;
const Document::Ptr document = semanticInfo.document;
const QFileInfo currentFileInfo(fileName);
@@ -632,11 +632,11 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
// Set up the current scope chain.
Interpreter::ObjectValue *scope = interp.globalObject();
Link link(qmlDocument, snapshot, &interp);
Link link(document, snapshot, &interp);
if (isQmlFile && qmlDocument) {
AST::UiObjectMember *declaringMember = semanticInfo.declaringMember(editor->position());
scope = link.scopeChainAt(qmlDocument, declaringMember);
if (document) {
AST::Node *declaringMember = semanticInfo.declaringMember(editor->position());
scope = link.scopeChainAt(document, declaringMember);
}
// Search for the operator that triggered the completion.