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

ClangCodeModel: pass ClangdClient to text mark constructor

Browse Source 
Change-Id: Ie7b9c23365648fcf6034175e0e18970d342e25e6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2022-05-12 08:48:50 +02:00
parent 04f1a0d6ab
commit fa577eb049
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangcodemodel/clangtextmark.cpp
View File

@@ -312,7 +312,7 @@ Task createTask(const ClangDiagnostic &diagnostic)
ClangdTextMark::ClangdTextMark(const FilePath &filePath, ClangdTextMark::ClangdTextMark(const FilePath &filePath,
const Diagnostic &diagnostic, const Diagnostic &diagnostic,
bool isProjectFile, bool isProjectFile,
Client *client) ClangdClient *client)
: TextEditor::TextMark(filePath, int(diagnostic.range().start().line() + 1), client->id()) : TextEditor::TextMark(filePath, int(diagnostic.range().start().line() + 1), client->id())
, m_lspDiagnostic(diagnostic) , m_lspDiagnostic(diagnostic)
, m_diagnostic(convertDiagnostic(ClangdDiagnostic(diagnostic), filePath)) , m_diagnostic(convertDiagnostic(ClangdDiagnostic(diagnostic), filePath))
@@ -330,7 +330,7 @@ ClangdTextMark::ClangdTextMark(const FilePath &filePath,
setLineAnnotation(diagnostic.message()); setLineAnnotation(diagnostic.message());
setColor(isError ? Theme::CodeModel_Error_TextMarkColor setColor(isError ? Theme::CodeModel_Error_TextMarkColor
: Theme::CodeModel_Warning_TextMarkColor); : Theme::CodeModel_Warning_TextMarkColor);
qobject_cast<ClangdClient *>(client)->addTask(createTask(m_diagnostic)); client->addTask(createTask(m_diagnostic));
} }
// Copy to clipboard action // Copy to clipboard action

4
src/plugins/clangcodemodel/clangtextmark.h
View File

@@ -40,6 +40,8 @@ namespace LanguageClient { class Client; }
namespace ClangCodeModel { namespace ClangCodeModel {
namespace Internal { namespace Internal {
class ClangdClient;
class ClangdTextMark : public TextEditor::TextMark class ClangdTextMark : public TextEditor::TextMark
{ {
Q_DECLARE_TR_FUNCTIONS(ClangdTextMark) Q_DECLARE_TR_FUNCTIONS(ClangdTextMark)
@@ -47,7 +49,7 @@ public:
ClangdTextMark(const ::Utils::FilePath &filePath, ClangdTextMark(const ::Utils::FilePath &filePath,
const LanguageServerProtocol::Diagnostic &diagnostic, const LanguageServerProtocol::Diagnostic &diagnostic,
bool isProjectFile, bool isProjectFile,
LanguageClient::Client *client); ClangdClient *client);
private: private:
bool addToolTipContent(QLayout *target) const override; bool addToolTipContent(QLayout *target) const override;