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

QmlJSEditor: Show snippets before other completion options.

Browse Source 
Reviewed-by: Erik Verbruggen
This commit is contained in:
Christian Kamm
2010-04-07 10:16:31 +02:00
parent 4f1d5ce196
commit c330411604
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -945,6 +945,8 @@ static bool qmlCompletionItemLessThan(const TextEditor::CompletionItem &l, const
return true; return true;
else if (r.text.isEmpty()) else if (r.text.isEmpty())
return false; return false;
else if (l.data.isValid() != r.data.isValid())
return l.data.isValid();
else if (l.text.at(0).isUpper() && r.text.at(0).isLower()) else if (l.text.at(0).isUpper() && r.text.at(0).isLower())
return false; return false;
else if (l.text.at(0).isLower() && r.text.at(0).isUpper()) else if (l.text.at(0).isLower() && r.text.at(0).isUpper())
@@ -963,15 +965,14 @@ QList<TextEditor::CompletionItem> CodeCompletion::getCompletions()
// Remove duplicates // Remove duplicates
QString lastKey; QString lastKey;
QVariant lastData;
QList<TextEditor::CompletionItem> uniquelist; QList<TextEditor::CompletionItem> uniquelist;
foreach (const TextEditor::CompletionItem &item, completionItems) { foreach (const TextEditor::CompletionItem &item, completionItems) {
if (item.text != lastKey) { if (item.text != lastKey || item.data.type() != lastData.type()) {
uniquelist.append(item); uniquelist.append(item);
lastKey = item.text; lastKey = item.text;
} else { lastData = item.data;
if (item.data.canConvert<QString>())
uniquelist.append(item);
} }
} }