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

Clang: Fix emphasizing current parameter in function signature tooltip

Browse Source 
...when completing function calls.

Task-number: QTCREATORBUG-15108
Change-Id: If55effe117774f3ec5debb03a9c7889981ea27d2
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-12-09 14:30:18 +01:00
parent 18fa35c152
commit 4382274ba4
5 changed files with 116 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.cpp
View File

@@ -81,9 +81,9 @@ void CompletionChunksToTextConverter::setAddExtraVerticalSpaceBetweenBraces(
m_addExtraVerticalSpaceBetweenBraces = addExtraVerticalSpaceBetweenBraces;
}
void CompletionChunksToTextConverter::setAddHtmlTags(bool addHtmlTags)
void CompletionChunksToTextConverter::setEmphasizeOptional(bool emphasizeOptional)
{
m_addHtmlTags = addHtmlTags;
m_emphasizeOptional = emphasizeOptional;
}
void CompletionChunksToTextConverter::setAddOptional(bool addOptional)
@@ -91,6 +91,11 @@ void CompletionChunksToTextConverter::setAddOptional(bool addOptional)
m_addOptional = addOptional;
}
void CompletionChunksToTextConverter::setPlaceHolderToEmphasize(int placeHolderNumber)
{
m_placeHolderPositionToEmphasize = placeHolderNumber;
}
const QString &CompletionChunksToTextConverter::text() const
{
return m_text;
@@ -107,12 +112,18 @@ bool CompletionChunksToTextConverter::hasPlaceholderPositions() const
}
QString CompletionChunksToTextConverter::convertToFunctionSignature(
const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks)
const ClangBackEnd::CodeCompletionChunks &codeCompletionChunks,
int parameterToEmphasize)
{
CompletionChunksToTextConverter converter;
converter.setAddPlaceHolderText(true);
converter.setAddResultType(true);
converter.setAddOptional(true);
converter.setEmphasizeOptional(true);
converter.setAddPlaceHolderPositions(true);
converter.setPlaceHolderToEmphasize(parameterToEmphasize);
converter.parseChunks(codeCompletionChunks);
@@ -137,7 +148,7 @@ QString CompletionChunksToTextConverter::convertToToolTip(
converter.setAddSpaces(true);
converter.setAddExtraVerticalSpaceBetweenBraces(true);
converter.setAddOptional(true);
converter.setAddHtmlTags(true);
converter.setEmphasizeOptional(true);
converter.setAddResultType(true);
converter.parseChunks(codeCompletionChunks);
@@ -188,7 +199,7 @@ void CompletionChunksToTextConverter::wrapInCursiveTagIfOptional(
const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk)
{
if (m_addOptional) {
if (m_addHtmlTags) {
if (m_emphasizeOptional) {
if (!m_previousCodeCompletionChunk.isOptional() && codeCompletionChunk.isOptional())
m_text += QStringLiteral("<i>");
else if (m_previousCodeCompletionChunk.isOptional() && !codeCompletionChunk.isOptional())
@@ -201,7 +212,7 @@ void CompletionChunksToTextConverter::parsePlaceHolder(
const ClangBackEnd::CodeCompletionChunk &codeCompletionChunk)
{
if (m_addPlaceHolderText)
m_text += codeCompletionChunk.text().toString();
appendText(codeCompletionChunk.text().toString(), emphasizeCurrentPlaceHolder());
if (m_addPlaceHolderPositions)
m_placeholderPositions.push_back(m_text.size());
@@ -274,6 +285,24 @@ void CompletionChunksToTextConverter::addExtraVerticalSpaceBetweenBraces(
}
}
bool CompletionChunksToTextConverter::emphasizeCurrentPlaceHolder() const
{
if (m_addPlaceHolderPositions) {
const uint currentPlaceHolderPosition = m_placeholderPositions.size() + 1;
return uint(m_placeHolderPositionToEmphasize) == currentPlaceHolderPosition;
}
return false;
}
void CompletionChunksToTextConverter::appendText(const QString &text, bool boldFormat)
{
if (boldFormat)
m_text += QStringLiteral("<b>") + text + QStringLiteral("</b>");
else
m_text += text;
}
bool CompletionChunksToTextConverter::canAddSpace() const
{
return m_addSpaces