aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/clangcodemodel
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2019-05-21 14:51:10 +0200
committerDavid Schulz <david.schulz@qt.io>2019-05-23 11:42:49 +0000
commitcf30c12624cae81785795b8df9e35e398370bc89 (patch)
tree6fb30178028365cdc1323088d63707549a43cdf6 /src/plugins/clangcodemodel
parent6fb9bf453f6f67af42649034af4ec5745e12d901 (diff)
TextEditor: make the format of completion item detail text adjustable
Instead of always assuming content in the form of rich text allow each item individually to define it's text format for the detail text that is shown as a tooltip of a completion item. Fixes: QTCREATORBUG-22429 Change-Id: I9fa71373a743c26fa06d48acc5f0509584830ca0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/clangcodemodel')
-rw-r--r--src/plugins/clangcodemodel/clangassistproposalitem.cpp5
-rw-r--r--src/plugins/clangcodemodel/clangassistproposalitem.h1
-rw-r--r--src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.cpp5
-rw-r--r--src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.h2
4 files changed, 13 insertions, 0 deletions
diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.cpp b/src/plugins/clangcodemodel/clangassistproposalitem.cpp
index 269298fa1e..3db4c7077f 100644
--- a/src/plugins/clangcodemodel/clangassistproposalitem.cpp
+++ b/src/plugins/clangcodemodel/clangassistproposalitem.cpp
@@ -495,6 +495,11 @@ bool ClangAssistProposalItem::isKeyword() const
return m_codeCompletions[0].completionKind == CodeCompletion::KeywordCompletionKind;
}
+Qt::TextFormat ClangAssistProposalItem::detailFormat() const
+{
+ return Qt::RichText;
+}
+
bool ClangAssistProposalItem::isSnippet() const
{
return false;
diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.h b/src/plugins/clangcodemodel/clangassistproposalitem.h
index 78d37344e9..64eb8789b3 100644
--- a/src/plugins/clangcodemodel/clangassistproposalitem.h
+++ b/src/plugins/clangcodemodel/clangassistproposalitem.h
@@ -48,6 +48,7 @@ public:
QIcon icon() const final;
QString detail() const final;
bool isKeyword() const final;
+ Qt::TextFormat detailFormat() const final;
bool isSnippet() const final;
bool isValid() const final;
quint64 hash() const final;
diff --git a/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.cpp b/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.cpp
index 72c6c2dd09..1d7a5d96f9 100644
--- a/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.cpp
+++ b/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.cpp
@@ -131,6 +131,11 @@ QString ClangPreprocessorAssistProposalItem::detail() const
return QString();
}
+Qt::TextFormat ClangPreprocessorAssistProposalItem::detailFormat() const
+{
+ return Qt::RichText;
+}
+
bool ClangPreprocessorAssistProposalItem::isSnippet() const
{
return false;
diff --git a/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.h b/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.h
index 1a5ee440a0..86073211be 100644
--- a/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.h
+++ b/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.h
@@ -51,6 +51,8 @@ public:
void setDetail(const QString &detail);
QString detail() const final;
+ Qt::TextFormat detailFormat() const final;
+
bool isSnippet() const final;
bool isValid() const final;