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

QmlJS: Improve completion for object bindings with 'on'.

Browse Source 
Done-with: Erik Verbruggen
This commit is contained in:
Christian Kamm
2010-04-29 14:30:30 +02:00
parent 953f0daa50
commit a48032b616
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -650,8 +650,6 @@ int CodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
bool doGlobalCompletion = true;
if (contextFinder.isInLhsOfBinding() && qmlScopeType) {
qDebug() << "LHS of binding!";
doGlobalCompletion = false;
EnumerateProperties enumerateProperties(&context);
enumerateProperties.setGlobalCompletion(true);
@@ -662,7 +660,9 @@ int CodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
TextEditor::CompletionItem item(this);
item.text = it.key();
item.data = QString(it.key() + QLatin1String(": "));
item.data = it.key();
if (!contextFinder.isAfterOnInLhsOfBinding())
item.data = QString(item.data.toString() + QLatin1String(": "));
item.icon = symbolIcon;
m_completions.append(item);
}
@@ -673,12 +673,6 @@ int CodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
TextEditor::CompletionItem item(this);
item.text = it.key();
QString data = it.key();
data.append(QLatin1String(" {\n"));
data.append(QChar::ObjectReplacementCharacter);
data.append(QChar::ObjectReplacementCharacter);
data.append(QLatin1String("\n}"));
item.data = data;
item.icon = symbolIcon;
m_completions.append(item);
}