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

Clang: Fix showing signature tooltips for functions

Browse Source 
...and others in the generic completion widget.

Task-number: QTCREATORBUG-14874
Change-Id: I75122eaf364d740b0a64ca514b31a26c5c8ea673
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-08-07 10:58:17 +02:00
committed by Marco Bubke
parent c4fe977e7c
commit 64d8ac4880
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
View File

@@ -100,10 +100,7 @@ QList<AssistProposalItem *> toAssistProposalItems(const CodeCompletions &complet
items.insert(name, item); items.insert(name, item);
item->setText(name); item->setText(name);
item->setOrder(ccr.priority()); item->setOrder(ccr.priority());
item->setDetail(CompletionChunksToTextConverter::convertToToolTip(ccr.chunks()));
if (ccr.completionKind() == CodeCompletion::KeywordCompletionKind)
item->setDetail(CompletionChunksToTextConverter::convertToToolTip(ccr.chunks()));
item->setCodeCompletion(ccr); item->setCodeCompletion(ccr);
} }

32
src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
View File

@@ -623,15 +623,33 @@ public:
ProposalModel proposal; ProposalModel proposal;
}; };
bool hasItem(ProposalModel model, const QByteArray &text) int indexOfItemWithText(ProposalModel model, const QByteArray &text)
{ {
if (!model) if (!model)
return false; return -1;
for (int i = 0, size = model->size(); i < size; ++i) { for (int i = 0, size = model->size(); i < size; ++i) {
const QString itemText = model->text(i); const QString itemText = model->text(i);
if (itemText == QString::fromUtf8(text)) if (itemText == QString::fromUtf8(text))
return true; return i;
}
return -1;
}
bool hasItem(ProposalModel model, const QByteArray &text)
{
return indexOfItemWithText(model, text) != -1;
}
bool hasItem(ProposalModel model, const QByteArray &text, const QByteArray &detail)
{
const int index = indexOfItemWithText(model, text);
if (index != -1 && index < model->size()) {
TextEditor::IAssistProposalModel *imodel = model.data();
const auto genericModel = static_cast<TextEditor::GenericProposalModel *>(imodel);
const auto itemDetail = genericModel->detail(index);
return itemDetail == QString::fromUtf8(detail);
} }
return false; return false;
@@ -844,10 +862,10 @@ void ClangCodeCompletionTest::testCompleteGlobals()
{ {
ProjectLessCompletionTest t("globalCompletion.cpp"); ProjectLessCompletionTest t("globalCompletion.cpp");
QVERIFY(hasItem(t.proposal, "globalVariable")); QVERIFY(hasItem(t.proposal, "globalVariable", "int globalVariable"));
QVERIFY(hasItem(t.proposal, "globalFunction")); QVERIFY(hasItem(t.proposal, "globalFunction", "void globalFunction ()"));
QVERIFY(hasItem(t.proposal, "GlobalClass")); QVERIFY(hasItem(t.proposal, "GlobalClass", "GlobalClass"));
QVERIFY(hasItem(t.proposal, "class")); // Keyword QVERIFY(hasItem(t.proposal, "class", "class")); // Keyword
QVERIFY(hasSnippet(t.proposal, "class")); // Snippet QVERIFY(hasSnippet(t.proposal, "class")); // Snippet
} }