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

ClangCodeModel: Provide diagnostics via clangd

Browse Source 
Change-Id: Ib45a62ebe200c2b56a1bb1a66f8a92103e60d092
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2021-06-02 17:51:31 +02:00
parent 54b4022987
commit 7bf52b0c0d
15 changed files with 320 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp
View File

@@ -104,7 +104,7 @@ public:
}
QWidget *createWidget(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics,
const ClangDiagnosticManager *diagMgr)
const std::function<bool()> &canApplyFixIt)
{
const QString text = htmlText(diagnostics);
@@ -133,7 +133,7 @@ public:
const TargetIdToDiagnosticTable table = m_targetIdsToDiagnostics;
const bool hideToolTipAfterLinkActivation = m_displayHints.hideTooltipAfterLinkActivation;
QObject::connect(label, &QLabel::linkActivated, [table, hideToolTipAfterLinkActivation,
diagMgr](const QString &action) {
canApplyFixIt](const QString &action) {
const ClangBackEnd::DiagnosticContainer diagnostic = table.value(action);
if (diagnostic == ClangBackEnd::DiagnosticContainer())
@@ -141,10 +141,8 @@ public:
else if (action.startsWith(LINK_ACTION_GOTO_LOCATION)) {
openEditorAt(diagnostic);
} else if (action.startsWith(LINK_ACTION_APPLY_FIX)) {
if (diagMgr && !diagMgr->diagnosticsInvalidated()
&& diagMgr->diagnosticsWithFixIts().contains(diagnostic)) {
if (canApplyFixIt && canApplyFixIt())
applyFixit(diagnostic);
}
} else {
QTC_CHECK(!"Link target cannot be handled.");
}
@@ -368,14 +366,14 @@ private:
};
WidgetFromDiagnostics::DisplayHints toHints(const ClangDiagnosticWidget::Destination &destination,
const ClangDiagnosticManager *diagMgr = nullptr)
const std::function<bool()> &canApplyFixIt)
{
WidgetFromDiagnostics::DisplayHints hints;
if (destination == ClangDiagnosticWidget::ToolTip) {
hints.showCategoryAndEnableOption = true;
hints.showFileNameInMainDiagnostic = false;
hints.enableClickableFixits = diagMgr && !diagMgr->diagnosticsInvalidated();
hints.enableClickableFixits = canApplyFixIt && canApplyFixIt();
hints.limitWidth = true;
hints.hideTooltipAfterLinkActivation = true;
hints.allowTextSelection = false;
@@ -398,7 +396,7 @@ QString ClangDiagnosticWidget::createText(
const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics,
const ClangDiagnosticWidget::Destination &destination)
{
const QString htmlText = WidgetFromDiagnostics(toHints(destination)).htmlText(diagnostics);
const QString htmlText = WidgetFromDiagnostics(toHints(destination, {})).htmlText(diagnostics);
QTextDocument document;
document.setHtml(htmlText);
@@ -413,9 +411,10 @@ QString ClangDiagnosticWidget::createText(
}
QWidget *ClangDiagnosticWidget::createWidget(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics,
const Destination &destination, const ClangDiagnosticManager *diagMgr)
const Destination &destination, const std::function<bool()> &canApplyFixIt)
{
return WidgetFromDiagnostics(toHints(destination, diagMgr)).createWidget(diagnostics, diagMgr);
return WidgetFromDiagnostics(toHints(destination, canApplyFixIt))
.createWidget(diagnostics, canApplyFixIt);
}
} // namespace Internal