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

TextEditor: Introduce AssistProposalItemInterface

Browse Source 
For unit test we need to break every dependency to the TextEditor
Widget etc.. With an abstract interface we can implement it in clang
without relying on unwanted dependencies. It makes it also easier to
compute the values deferred.

Change-Id: I1b313a1625f4e80bd324ab4bf1a7c4f6b690abe9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Marco Bubke
2016-02-01 14:51:01 +01:00
parent e42bf6ebc6
commit c903f4974f
31 changed files with 187 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
View File

@@ -101,7 +101,9 @@ private:
class VirtualFunctionProposal : public GenericProposal
{
public:
VirtualFunctionProposal(int cursorPos, const QList<AssistProposalItem *> &items, bool openInSplit)
VirtualFunctionProposal(int cursorPos,
const QList<AssistProposalItemInterface *> &items,
bool openInSplit)
: GenericProposal(cursorPos, items)
, m_openInSplit(openInSplit)
{}
@@ -126,13 +128,12 @@ public:
{
QTC_ASSERT(m_params.function, return 0);
AssistProposalItem *hintItem
= new VirtualFunctionProposalItem(TextEditorWidget::Link());
auto *hintItem = new VirtualFunctionProposalItem(TextEditorWidget::Link());
hintItem->setText(QCoreApplication::translate("VirtualFunctionsAssistProcessor",
"...searching overrides"));
hintItem->setOrder(-1000);
QList<AssistProposalItem *> items;
QList<AssistProposalItemInterface *> items;
items << itemFromFunction(m_params.function);
items << hintItem;
return new VirtualFunctionProposal(m_params.cursorPosition, items, m_params.openInNextSplit);
@@ -156,7 +157,7 @@ public:
if (overrides.isEmpty())
return 0;
QList<AssistProposalItem *> items;
QList<AssistProposalItemInterface *> items;
foreach (Function *func, overrides)
items << itemFromFunction(func);
items.first()->setOrder(1000); // Ensure top position for function of static type
@@ -172,14 +173,14 @@ private:
return func;
}
AssistProposalItem *itemFromFunction(Function *func) const
VirtualFunctionProposalItem *itemFromFunction(Function *func) const
{
const TextEditorWidget::Link link = CppTools::linkToSymbol(maybeDefinitionFor(func));
QString text = m_overview.prettyName(LookupContext::fullyQualifiedName(func));
if (func->isPureVirtual())
text += QLatin1String(" = 0");
AssistProposalItem *item = new VirtualFunctionProposalItem(link, m_params.openInNextSplit);
auto *item = new VirtualFunctionProposalItem(link, m_params.openInNextSplit);
item->setText(text);
item->setIcon(m_icons.iconForSymbol(func));