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

Separate bind into bind, link imports and building the scope chain.

Browse Source
This commit is contained in:
Christian Kamm
2010-01-28 14:53:53 +01:00
parent 2ab90078f4
commit 1d39377fb1
7 changed files with 261 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@
#include <qmljs/parser/qmljsast_p.h>
#include <qmljs/qmljsbind.h>
#include <qmljs/qmljslink.h>
#include <qmljs/qmljsinterpreter.h>
#include <qmljs/qmljsscanner.h>
#include <qmljs/qmljscheck.h>
@@ -589,8 +590,6 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
Interpreter::ObjectValue *scope = interp.globalObject();
if (isQmlFile) {
scope = interp.newObject(/* prototype = */ 0);
AST::UiObjectMember *declaringMember = 0;
const int cursorPosition = editor->position();
@@ -600,8 +599,7 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
}
}
Bind bind(qmlDocument, snapshot, &interp);
scope = bind(declaringMember);
scope = Bind::scopeChainAt(qmlDocument, snapshot, &interp, declaringMember);
}
// Search for the operator that triggered the completion.
@@ -612,16 +610,6 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
if (completionOperator.isSpace() || completionOperator.isNull() || isDelimiter(completionOperator) ||
(completionOperator == QLatin1Char('(') && m_startPosition != editor->position())) {
// It's a global completion.
// Process the visible user defined components.
QHashIterator<QString, Document::Ptr> componentIt(userComponents);
while (componentIt.hasNext()) {
componentIt.next();
TextEditor::CompletionItem item(this);
item.text = componentIt.key();
item.icon = componentIcon;
m_completions.append(item);
}
EnumerateProperties enumerateProperties;
enumerateProperties.setGlobalCompletion(true);
QHashIterator<QString, const Interpreter::Value *> it(enumerateProperties(scope, /* lookAtScope = */ true));

3
src/plugins/qmljseditor/qmlhoverhandler.cpp
View File

@@ -190,8 +190,7 @@ void QmlHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
}
Interpreter::Engine interp;
Bind bind(qmlDocument, snapshot, &interp);
Interpreter::ObjectValue *scope = bind(declaringMember);
Interpreter::ObjectValue *scope = Bind::scopeChainAt(qmlDocument, snapshot, &interp, declaringMember);
Check check(&interp);
const Interpreter::Value *value = check(expression, scope);
QStringList baseClasses;