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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: I8d1c9720a868da02b3157a48954eb4e262539c84
This commit is contained in:
Eike Ziller
2023-06-15 09:48:58 +02:00
parent e7870f736d 580202f54b
commit 6c601b8cd4
67 changed files with 1046 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -711,11 +711,11 @@ class ClangdDiagnosticManager : public LanguageClient::DiagnosticManager
});
}
TextMark *createTextMark(const Utils::FilePath &filePath,
TextMark *createTextMark(TextDocument *doc,
const Diagnostic &diagnostic,
bool isProjectFile) const override
{
return new ClangdTextMark(filePath, diagnostic, isProjectFile, getClient());
return new ClangdTextMark(doc, diagnostic, isProjectFile, getClient());
}
};

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

@@ -263,16 +263,16 @@ Task createTask(const ClangDiagnostic &diagnostic)
} // anonymous namespace
ClangdTextMark::ClangdTextMark(const FilePath &filePath,
ClangdTextMark::ClangdTextMark(TextEditor::TextDocument *doc,
const Diagnostic &diagnostic,
bool isProjectFile,
ClangdClient *client)
: TextEditor::TextMark(filePath,
: TextEditor::TextMark(doc,
int(diagnostic.range().start().line() + 1),
{client->name(), client->id()})
, m_lspDiagnostic(diagnostic)
, m_diagnostic(
convertDiagnostic(ClangdDiagnostic(diagnostic), filePath, client->hostPathMapper()))
convertDiagnostic(ClangdDiagnostic(diagnostic), doc->filePath(), client->hostPathMapper()))
, m_client(client)
{
setSettingsPage(CppEditor::Constants::CPP_CLANGD_SETTINGS_ID);

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

@@ -23,7 +23,7 @@ class ClangdClient;
class ClangdTextMark : public TextEditor::TextMark
{
public:
ClangdTextMark(const ::Utils::FilePath &filePath,
ClangdTextMark(TextEditor::TextDocument *doc,
const LanguageServerProtocol::Diagnostic &diagnostic,
bool isProjectFile,
ClangdClient *client);