2015-07-06 12:05:02 +02:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
|
|
|
** Contact: https://www.qt.io/licensing/
|
2015-07-06 12:05:02 +02:00
|
|
|
**
|
|
|
|
|
** This file is part of Qt Creator.
|
|
|
|
|
**
|
|
|
|
|
** Commercial License Usage
|
|
|
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
|
|
** accordance with the commercial license agreement provided with the
|
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
2016-01-15 14:57:40 +01:00
|
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
|
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
2015-07-06 12:05:02 +02:00
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** GNU General Public License Usage
|
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
|
|
|
** General Public License version 3 as published by the Free Software
|
|
|
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
|
|
|
** included in the packaging of this file. Please review the following
|
|
|
|
|
** information to ensure the GNU General Public License requirements will
|
|
|
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
2015-07-06 12:05:02 +02:00
|
|
|
**
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
|
|
#include "clangassistproposalitem.h"
|
|
|
|
|
|
|
|
|
|
#include "clangassistproposalmodel.h"
|
|
|
|
|
|
2016-02-01 14:51:01 +01:00
|
|
|
#include <texteditor/codeassist/assistproposaliteminterface.h>
|
2015-07-07 13:09:04 +02:00
|
|
|
|
|
|
|
|
#include <algorithm>
|
|
|
|
|
|
2015-07-06 12:05:02 +02:00
|
|
|
namespace ClangCodeModel {
|
|
|
|
|
namespace Internal {
|
|
|
|
|
|
2017-06-02 09:17:51 +02:00
|
|
|
constexpr int SORT_LIMIT = 30000;
|
Clang: Set limit for sorting completion items
Having *some* limit is reasonable since sorting happens in the UI thread
and given enough includes/symbols it will freeze sooner or later.
The strategy is now: Stop sorting at all if there are more than 30.000
completion items to process.
The limit is a guess made on the following measurements. The goal is to
keep below 100ms.
test | items | before | now
-----+-----------------------
Cpp1 | 6394 | 172ms | 15ms |
Win1 | 44739 | 125ms | 56ms |
Qtc1 | 9648, | 16ms | 15ms |
Qtc2 | 10210 | 20ms | 16ms |
Qtc3 | 51044 | 141ms | 63ms |
Qt1 | 62953 | 172ms | 78ms |
Windows.h alone pulls in about 44.000 completion items.
Used test procedure
-------------------
For each test below, do:
1. Start Qt Creator in release mode
2. Open/create the project with a MSVC2015 Kit
3. Open the mentioned file
4. Strg+Space in the mentioned function
Measured with a timer in IpcReceiver::codeCompleted.
Test projects:
Cpp1: stdc++11-includes.pro, main.cpp, main()
Win1: Create project from wizard, *.cpp file including windows.h, completion
in some added function
Qtc1: qtcreator.pro, texteditor.cpp, BaseTextEditor::duplicate()
Qtc2: qtcreator.pro, fakevimhandler.cpp, FakeVimHandler::jumpToLocalMark
Qtc3: qtcreator.pro, botan.cpp, version_string()
Qt1: qt-essential-includes.pro, main.cpp, main()
Change-Id: I6fbd65d14f6086f289be7dd6c24385996e4bde83
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-26 11:32:37 +02:00
|
|
|
|
2016-01-11 15:20:04 +01:00
|
|
|
ClangAssistProposalModel::ClangAssistProposalModel(
|
|
|
|
|
ClangBackEnd::CompletionCorrection neededCorrection)
|
|
|
|
|
: m_neededCorrection(neededCorrection)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2016-07-26 08:52:12 +02:00
|
|
|
bool ClangAssistProposalModel::containsDuplicates() const
|
|
|
|
|
{
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-06 12:05:02 +02:00
|
|
|
bool ClangAssistProposalModel::isSortable(const QString &/*prefix*/) const
|
|
|
|
|
{
|
Clang: Set limit for sorting completion items
Having *some* limit is reasonable since sorting happens in the UI thread
and given enough includes/symbols it will freeze sooner or later.
The strategy is now: Stop sorting at all if there are more than 30.000
completion items to process.
The limit is a guess made on the following measurements. The goal is to
keep below 100ms.
test | items | before | now
-----+-----------------------
Cpp1 | 6394 | 172ms | 15ms |
Win1 | 44739 | 125ms | 56ms |
Qtc1 | 9648, | 16ms | 15ms |
Qtc2 | 10210 | 20ms | 16ms |
Qtc3 | 51044 | 141ms | 63ms |
Qt1 | 62953 | 172ms | 78ms |
Windows.h alone pulls in about 44.000 completion items.
Used test procedure
-------------------
For each test below, do:
1. Start Qt Creator in release mode
2. Open/create the project with a MSVC2015 Kit
3. Open the mentioned file
4. Strg+Space in the mentioned function
Measured with a timer in IpcReceiver::codeCompleted.
Test projects:
Cpp1: stdc++11-includes.pro, main.cpp, main()
Win1: Create project from wizard, *.cpp file including windows.h, completion
in some added function
Qtc1: qtcreator.pro, texteditor.cpp, BaseTextEditor::duplicate()
Qtc2: qtcreator.pro, fakevimhandler.cpp, FakeVimHandler::jumpToLocalMark
Qtc3: qtcreator.pro, botan.cpp, version_string()
Qt1: qt-essential-includes.pro, main.cpp, main()
Change-Id: I6fbd65d14f6086f289be7dd6c24385996e4bde83
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-26 11:32:37 +02:00
|
|
|
return m_currentItems.size() <= SORT_LIMIT;
|
2015-07-06 12:05:02 +02:00
|
|
|
}
|
|
|
|
|
|
2015-07-07 13:09:04 +02:00
|
|
|
void ClangAssistProposalModel::sort(const QString &/*prefix*/)
|
|
|
|
|
{
|
2016-02-01 14:51:01 +01:00
|
|
|
using TextEditor::AssistProposalItemInterface;
|
2015-07-07 13:09:04 +02:00
|
|
|
|
2016-02-01 14:51:01 +01:00
|
|
|
auto currentItemsCompare = [](AssistProposalItemInterface *first,
|
|
|
|
|
AssistProposalItemInterface *second) {
|
2017-06-02 09:17:51 +02:00
|
|
|
if (first->prefixMatch() != second->prefixMatch()) {
|
|
|
|
|
return static_cast<int>(first->prefixMatch())
|
|
|
|
|
< static_cast<int>(second->prefixMatch());
|
|
|
|
|
}
|
2015-07-07 13:09:04 +02:00
|
|
|
return (first->order() > 0
|
|
|
|
|
&& (first->order() < second->order()
|
2017-06-02 09:17:51 +02:00
|
|
|
|| (first->order() == second->order() && first->text() < second->text())));
|
2015-07-07 13:09:04 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
std::sort(m_currentItems.begin(), m_currentItems.end(), currentItemsCompare);
|
|
|
|
|
}
|
|
|
|
|
|
2016-01-11 15:20:04 +01:00
|
|
|
ClangBackEnd::CompletionCorrection ClangAssistProposalModel::neededCorrection() const
|
|
|
|
|
{
|
|
|
|
|
return m_neededCorrection;
|
|
|
|
|
}
|
|
|
|
|
|
2015-07-06 12:05:02 +02:00
|
|
|
} // namespace Internal
|
|
|
|
|
} // namespace ClangCodeModel
|
|
|
|
|
|