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

Clang: change global completions order

Browse Source 
Give CamelCase completions lower priority

Task-number: QTCREATORBUG-18319
Change-Id: I812d22616e8ab0e3d186bcf7a6a569de22be2a07
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-06-02 09:17:51 +02:00
parent f3cd5cdb7e
commit 8922fbf4be
3 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/texteditor/codeassist/genericproposalmodel.cpp
View File

@@ -45,8 +45,8 @@ uint qHash(const AssistProposalItem &item)
namespace {
const int kMaxSort = 1000;
const int kMaxPrefixFilter = 100;
constexpr int kMaxSort = 1000;
constexpr int kMaxPrefixFilter = 100;
struct ContentLessThan
{
@@ -309,9 +309,20 @@ void GenericProposalModel::filter(const QString &prefix)
QRegExp regExp(keyRegExp);
m_currentItems.clear();
const QString lowerPrefix = prefix.toLower();
foreach (const auto &item, m_originalItems) {
if (regExp.indexIn(item->text()) == 0)
const QString &text = item->text();
if (regExp.indexIn(text) == 0) {
m_currentItems.append(item);
if (text.startsWith(prefix)) {
// Direct match
item->setPrefixMatch(AssistProposalItemInterface::PrefixMatch::Exact);
continue;
}
if (text.startsWith(lowerPrefix, Qt::CaseInsensitive))
item->setPrefixMatch(AssistProposalItemInterface::PrefixMatch::Lower);
}
}
}