summaryrefslogtreecommitdiff
path: root/src/plugins/qmljseditor
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2010-12-20 16:10:56 +0100
committerRoberto Raggi <roberto.raggi@nokia.com>2010-12-20 16:15:49 +0100
commit207c29555282df39c44e5c298c8ad8bee743ba1c (patch)
tree3fa3c9d699ee8ff907016c40553e195a20773d51 /src/plugins/qmljseditor
parenta73e1f7596d9362605b469d9a5c85239928ef8d4 (diff)
downloadqt-creator-207c29555282df39c44e5c298c8ad8bee743ba1c.tar.gz
Sort the completion items when searching for common prefixes.
Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'src/plugins/qmljseditor')
-rw-r--r--src/plugins/qmljseditor/qmljscodecompletion.cpp7
-rw-r--r--src/plugins/qmljseditor/qmljscodecompletion.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/qmljseditor/qmljscodecompletion.cpp b/src/plugins/qmljseditor/qmljscodecompletion.cpp
index 7f46be938a..80aa8035c9 100644
--- a/src/plugins/qmljseditor/qmljscodecompletion.cpp
+++ b/src/plugins/qmljseditor/qmljscodecompletion.cpp
@@ -1074,13 +1074,18 @@ static bool qmlCompletionItemLessThan(const TextEditor::CompletionItem &l, const
return l.text < r.text;
}
+void CodeCompletion::sortCompletion(QList<TextEditor::CompletionItem> &completionItems)
+{
+ qStableSort(completionItems.begin(), completionItems.end(), qmlCompletionItemLessThan);
+}
+
QList<TextEditor::CompletionItem> CodeCompletion::getCompletions()
{
QList<TextEditor::CompletionItem> completionItems;
completions(&completionItems);
- qStableSort(completionItems.begin(), completionItems.end(), qmlCompletionItemLessThan);
+ sortCompletion(completionItems);
// Remove duplicates
QString lastKey;
diff --git a/src/plugins/qmljseditor/qmljscodecompletion.h b/src/plugins/qmljseditor/qmljscodecompletion.h
index 98821f579f..440d20fb9c 100644
--- a/src/plugins/qmljseditor/qmljscodecompletion.h
+++ b/src/plugins/qmljseditor/qmljscodecompletion.h
@@ -77,6 +77,7 @@ public:
virtual void complete(const TextEditor::CompletionItem &item, QChar typedChar);
virtual bool partiallyComplete(const QList<TextEditor::CompletionItem> &completionItems);
virtual QList<TextEditor::CompletionItem> getCompletions();
+ virtual void sortCompletion(QList<TextEditor::CompletionItem> &completionItems);
virtual void cleanup();