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

Clang: Merge highlighting/diagnostics messages

Browse Source 
The messages

    RequestDiagnosticsMessage
    RequestHighlightingMessage

and

    DiagnosticsChangedMessage
    HighlightingChangedMessage

are always send/received together, so merge them into

    RequestDocumentAnnotationsMessage
    DocumentAnnotationsChangedMessage

Change-Id: I6a0b6281ed1e6efe6cb18386afe99b1d1fb58abf
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2016-06-09 12:55:42 +02:00
parent 3be096f152
commit 8f9c42c640
36 changed files with 210 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/clangbackendipc/clangbackendipc-lib.pri
View File

@@ -34,23 +34,21 @@ SOURCES += $$PWD/clangcodemodelserverinterface.cpp \
$$PWD/projectpartsdonotexistmessage.cpp \
$$PWD/lineprefixer.cpp \
$$PWD/clangbackendipcdebugutils.cpp \
$$PWD/diagnosticschangedmessage.cpp \
$$PWD/diagnosticcontainer.cpp \
$$PWD/sourcerangecontainer.cpp \
$$PWD/sourcelocationcontainer.cpp \
$$PWD/fixitcontainer.cpp \
$$PWD/requestdiagnosticsmessage.cpp \
$$PWD/requesthighlightingmessage.cpp \
$$PWD/requestdocumentannotations.cpp \
$$PWD/registerunsavedfilesforeditormessage.cpp \
$$PWD/unregisterunsavedfilesforeditormessage.cpp \
$$PWD/updatetranslationunitsforeditormessage.cpp \
$$PWD/updatevisibletranslationunitsmessage.cpp \
$$PWD/highlightingchangedmessage.cpp \
$$PWD/highlightingmarkcontainer.cpp \
$$PWD/messageenvelop.cpp \
$$PWD/ipcclientinterface.cpp \
$$PWD/ipcserverinterface.cpp \
$$PWD/clangcodemodelconnectionclient.cpp
$$PWD/clangcodemodelconnectionclient.cpp \
$$PWD/documentannotationschangedmessage.cpp
HEADERS += \
$$PWD/clangcodemodelserverinterface.h \
@@ -80,22 +78,20 @@ HEADERS += \
$$PWD/clangbackendipc_global.h \
$$PWD/lineprefixer.h \
$$PWD/clangbackendipcdebugutils.h \
$$PWD/diagnosticschangedmessage.h \
$$PWD/diagnosticcontainer.h \
$$PWD/sourcerangecontainer.h \
$$PWD/sourcelocationcontainer.h \
$$PWD/fixitcontainer.h \
$$PWD/requestdiagnosticsmessage.h \
$$PWD/requesthighlightingmessage.h \
$$PWD/requestdocumentannotations.h \
$$PWD/registerunsavedfilesforeditormessage.h \
$$PWD/unregisterunsavedfilesforeditormessage.h \
$$PWD/updatetranslationunitsforeditormessage.h \
$$PWD/updatevisibletranslationunitsmessage.h \
$$PWD/highlightingchangedmessage.h \
$$PWD/highlightingmarkcontainer.h \
$$PWD/messageenvelop.h \
$$PWD/ipcclientinterface.h \
$$PWD/ipcserverinterface.h \
$$PWD/clangcodemodelconnectionclient.h
$$PWD/clangcodemodelconnectionclient.h \
$$PWD/documentannotationschangedmessage.h
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols

7
src/libs/clangbackendipc/clangbackendipc_global.h
View File

@@ -97,11 +97,8 @@ enum class MessageType : quint8 {
RegisterProjectPartsForEditorMessage,
UnregisterProjectPartsForEditorMessage,
RequestDiagnosticsMessage,
DiagnosticsChangedMessage,
RequestHighlightingMessage,
HighlightingChangedMessage,
RequestDocumentAnnotationsMessage,
DocumentAnnotationsChangedMessage,
UpdateVisibleTranslationUnitsMessage,

10
src/libs/clangbackendipc/clangcodemodelclientinterface.cpp
View File

@@ -27,11 +27,10 @@
#include "cmbcodecompletedmessage.h"
#include "cmbechomessage.h"
#include "documentannotationschangedmessage.h"
#include "messageenvelop.h"
#include "projectpartsdonotexistmessage.h"
#include "translationunitdoesnotexistmessage.h"
#include "diagnosticschangedmessage.h"
#include "highlightingchangedmessage.h"
#include <QDebug>
#include <QVariant>
@@ -56,11 +55,8 @@ void ClangCodeModelClientInterface::dispatch(const MessageEnvelop &messageEnvelo
case MessageType::ProjectPartsDoNotExistMessage:
projectPartsDoNotExist(messageEnvelop.message<ProjectPartsDoNotExistMessage>());
break;
case MessageType::DiagnosticsChangedMessage:
diagnosticsChanged(messageEnvelop.message<DiagnosticsChangedMessage>());
break;
case MessageType::HighlightingChangedMessage:
highlightingChanged(messageEnvelop.message<HighlightingChangedMessage>());
case MessageType::DocumentAnnotationsChangedMessage:
documentAnnotationsChanged(messageEnvelop.message<DocumentAnnotationsChangedMessage>());
break;
default:
qWarning() << "Unknown ClangCodeModelClientMessage";

9
src/libs/clangbackendipc/clangcodemodelclientinterface.h
View File

@@ -40,13 +40,11 @@ class CompleteCodeMessage;
class CodeCompletedMessage;
class TranslationUnitDoesNotExistMessage;
class ProjectPartsDoNotExistMessage;
class DiagnosticsChangedMessage;
class RequestDiagnosticsMessage;
class RegisterUnsavedFilesForEditorMessage;
class UnregisterUnsavedFilesForEditorMessage;
class UpdateVisibleTranslationUnitsMessage;
class RequestHighlightingMessage;
class HighlightingChangedMessage;
class RequestDocumentAnnotationsMessage;
class DocumentAnnotationsChangedMessage;
class CMBIPC_EXPORT ClangCodeModelClientInterface : public IpcClientInterface
{
@@ -58,8 +56,7 @@ public:
virtual void codeCompleted(const CodeCompletedMessage &message) = 0;
virtual void translationUnitDoesNotExist(const TranslationUnitDoesNotExistMessage &message) = 0;
virtual void projectPartsDoNotExist(const ProjectPartsDoNotExistMessage &message) = 0;
virtual void diagnosticsChanged(const DiagnosticsChangedMessage &message) = 0;
virtual void highlightingChanged(const HighlightingChangedMessage &message) = 0;
virtual void documentAnnotationsChanged(const DocumentAnnotationsChangedMessage &message) = 0;
};
} // namespace ClangBackEnd

11
src/libs/clangbackendipc/clangcodemodelclientproxy.cpp
View File

@@ -29,9 +29,9 @@
#include "cmbcodecompletedmessage.h"
#include "cmbechomessage.h"
#include "cmbregistertranslationunitsforeditormessage.h"
#include "diagnosticschangedmessage.h"
#include "highlightingchangedmessage.h"
#include "documentannotationschangedmessage.h"
#include "clangcodemodelserverinterface.h"
#include "ipcserverinterface.h"
#include "messageenvelop.h"
#include "projectpartsdonotexistmessage.h"
#include "translationunitdoesnotexistmessage.h"
@@ -96,12 +96,7 @@ void ClangCodeModelClientProxy::projectPartsDoNotExist(const ProjectPartsDoNotEx
writeMessageBlock.write(message);
}
void ClangCodeModelClientProxy::diagnosticsChanged(const DiagnosticsChangedMessage &message)
{
writeMessageBlock.write(message);
}
void ClangCodeModelClientProxy::highlightingChanged(const HighlightingChangedMessage &message)
void ClangCodeModelClientProxy::documentAnnotationsChanged(const DocumentAnnotationsChangedMessage &message)
{
writeMessageBlock.write(message);
}

3
src/libs/clangbackendipc/clangcodemodelclientproxy.h
View File

@@ -56,8 +56,7 @@ public:
void codeCompleted(const CodeCompletedMessage &message) override;
void translationUnitDoesNotExist(const TranslationUnitDoesNotExistMessage &message) override;
void projectPartsDoNotExist(const ProjectPartsDoNotExistMessage &message) override;
void diagnosticsChanged(const DiagnosticsChangedMessage &message) override;
void highlightingChanged(const HighlightingChangedMessage &message) override;
void documentAnnotationsChanged(const DocumentAnnotationsChangedMessage &message) override;
void readMessages();

10
src/libs/clangbackendipc/clangcodemodelserverinterface.cpp
View File

@@ -32,8 +32,7 @@
#include "cmbunregistertranslationunitsforeditormessage.h"
#include "messageenvelop.h"
#include "registerunsavedfilesforeditormessage.h"
#include "requestdiagnosticsmessage.h"
#include "requesthighlightingmessage.h"
#include "requestdocumentannotations.h"
#include "unregisterunsavedfilesforeditormessage.h"
#include "updatetranslationunitsforeditormessage.h"
#include "updatevisibletranslationunitsmessage.h"
@@ -73,11 +72,8 @@ void ClangCodeModelServerInterface::dispatch(const MessageEnvelop &messageEnvelo
case MessageType::CompleteCodeMessage:
completeCode(messageEnvelop.message<CompleteCodeMessage>());
break;
case MessageType::RequestDiagnosticsMessage:
requestDiagnostics(messageEnvelop.message<RequestDiagnosticsMessage>());
break;
case MessageType::RequestHighlightingMessage:
requestHighlighting(messageEnvelop.message<RequestHighlightingMessage>());
case MessageType::RequestDocumentAnnotationsMessage:
requestDocumentAnnotations(messageEnvelop.message<RequestDocumentAnnotationsMessage>());
break;
case MessageType::UpdateVisibleTranslationUnitsMessage:
updateVisibleTranslationUnits(messageEnvelop.message<UpdateVisibleTranslationUnitsMessage>());

3
src/libs/clangbackendipc/clangcodemodelserverinterface.h
View File

@@ -47,8 +47,7 @@ public:
virtual void registerUnsavedFilesForEditor(const RegisterUnsavedFilesForEditorMessage &message) = 0;
virtual void unregisterUnsavedFilesForEditor(const UnregisterUnsavedFilesForEditorMessage &message) = 0;
virtual void completeCode(const CompleteCodeMessage &message) = 0;
virtual void requestDiagnostics(const RequestDiagnosticsMessage &message) = 0;
virtual void requestHighlighting(const RequestHighlightingMessage &message) = 0;
virtual void requestDocumentAnnotations(const RequestDocumentAnnotationsMessage &message) = 0;
virtual void updateVisibleTranslationUnits(const UpdateVisibleTranslationUnitsMessage &message) = 0;
};

10
src/libs/clangbackendipc/clangcodemodelserverproxy.cpp
View File

@@ -35,8 +35,7 @@
#include <clangcodemodelclientinterface.h>
#include <messageenvelop.h>
#include <registerunsavedfilesforeditormessage.h>
#include <requestdiagnosticsmessage.h>
#include <requesthighlightingmessage.h>
#include <requestdocumentannotations.h>
#include <unregisterunsavedfilesforeditormessage.h>
#include <updatetranslationunitsforeditormessage.h>
#include <updatevisibletranslationunitsmessage.h>
@@ -112,12 +111,7 @@ void ClangCodeModelServerProxy::completeCode(const CompleteCodeMessage &message)
writeMessageBlock.write(message);
}
void ClangCodeModelServerProxy::requestDiagnostics(const ClangBackEnd::RequestDiagnosticsMessage &message)
{
writeMessageBlock.write(message);
}
void ClangCodeModelServerProxy::requestHighlighting(const RequestHighlightingMessage &message)
void ClangCodeModelServerProxy::requestDocumentAnnotations(const RequestDocumentAnnotationsMessage &message)
{
writeMessageBlock.write(message);
}

3
src/libs/clangbackendipc/clangcodemodelserverproxy.h
View File

@@ -58,8 +58,7 @@ public:
void registerUnsavedFilesForEditor(const RegisterUnsavedFilesForEditorMessage &message) override;
void unregisterUnsavedFilesForEditor(const UnregisterUnsavedFilesForEditorMessage &message) override;
void completeCode(const CompleteCodeMessage &message) override;
void requestDiagnostics(const RequestDiagnosticsMessage &message) override;
void requestHighlighting(const RequestHighlightingMessage &message) override;
void requestDocumentAnnotations(const RequestDocumentAnnotationsMessage &message) override;
void updateVisibleTranslationUnits(const UpdateVisibleTranslationUnitsMessage &message) override;
void readMessages();

91
src/libs/clangbackendipc/diagnosticschangedmessage.cpp
View File

@@ -1,91 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "diagnosticschangedmessage.h"
#include <QDataStream>
#include <QDebug>
#include <ostream>
namespace ClangBackEnd {
DiagnosticsChangedMessage::DiagnosticsChangedMessage(const FileContainer &file,
const QVector<DiagnosticContainer> &diagnostics)
: file_(file),
diagnostics_(diagnostics)
{
}
const FileContainer &DiagnosticsChangedMessage::file() const
{
return file_;
}
const QVector<DiagnosticContainer> &DiagnosticsChangedMessage::diagnostics() const
{
return diagnostics_;
}
QDataStream &operator<<(QDataStream &out, const DiagnosticsChangedMessage &message)
{
out << message.file_;
out << message.diagnostics_;
return out;
}
QDataStream &operator>>(QDataStream &in, DiagnosticsChangedMessage &message)
{
in >> message.file_;
in >> message.diagnostics_;
return in;
}
bool operator==(const DiagnosticsChangedMessage &first, const DiagnosticsChangedMessage &second)
{
return first.file_ == second.file_
&& first.diagnostics_ == second.diagnostics_;
}
QDebug operator<<(QDebug debug, const DiagnosticsChangedMessage &message)
{
debug.nospace() << "DiagnosticsChangedMessage("
<< message.file_
<< ")";
return debug;
}
void PrintTo(const DiagnosticsChangedMessage &message, ::std::ostream* os)
{
*os << "DiagnosticsChangedMessage(";
PrintTo(message.file(), os);
*os << ")";
}
} // namespace ClangBackEnd

65
src/libs/clangbackendipc/diagnosticschangedmessage.h
View File

@@ -1,65 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include "clangbackendipc_global.h"
#include "diagnosticcontainer.h"
#include "filecontainer.h"
#include <QVector>
namespace ClangBackEnd {
class CMBIPC_EXPORT DiagnosticsChangedMessage
{
friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const DiagnosticsChangedMessage &message);
friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, DiagnosticsChangedMessage &message);
friend CMBIPC_EXPORT bool operator==(const DiagnosticsChangedMessage &first, const DiagnosticsChangedMessage &second);
friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DiagnosticsChangedMessage &message);
friend void PrintTo(const DiagnosticsChangedMessage &message, ::std::ostream* os);
public:
DiagnosticsChangedMessage() = default;
DiagnosticsChangedMessage(const FileContainer &file,
const QVector<DiagnosticContainer> &diagnostics);
const FileContainer &file() const;
const QVector<DiagnosticContainer> &diagnostics() const;
private:
FileContainer file_;
QVector<DiagnosticContainer> diagnostics_;
};
CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const DiagnosticsChangedMessage &message);
CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, DiagnosticsChangedMessage &message);
CMBIPC_EXPORT bool operator==(const DiagnosticsChangedMessage &first, const DiagnosticsChangedMessage &second);
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DiagnosticsChangedMessage &message);
void PrintTo(const DiagnosticsChangedMessage &message, ::std::ostream* os);
DECLARE_MESSAGE(DiagnosticsChangedMessage)
} // namespace ClangBackEnd

52
src/libs/clangbackendipc/highlightingchangedmessage.cpp → src/libs/clangbackendipc/documentannotationschangedmessage.cpp
View File

@@ -23,7 +23,7 @@
**
****************************************************************************/
#include "highlightingchangedmessage.h"
#include "documentannotationschangedmessage.h"
#include <QDataStream>
#include <QDebug>
@@ -32,59 +32,72 @@
namespace ClangBackEnd {
HighlightingChangedMessage::HighlightingChangedMessage(const FileContainer &file,
DocumentAnnotationsChangedMessage::DocumentAnnotationsChangedMessage(
const FileContainer &file,
const QVector<DiagnosticContainer> &diagnostics,
const QVector<HighlightingMarkContainer> &highlightingMarks,
const QVector<SourceRangeContainer> &skippedPreprocessorRanges)
: file_(file),
: fileContainer_(file),
diagnostics_(diagnostics),
highlightingMarks_(highlightingMarks),
skippedPreprocessorRanges_(skippedPreprocessorRanges)
{
}
const FileContainer &HighlightingChangedMessage::file() const
const FileContainer &DocumentAnnotationsChangedMessage::fileContainer() const
{
return file_;
return fileContainer_;
}
const QVector<HighlightingMarkContainer> &HighlightingChangedMessage::highlightingMarks() const
const QVector<DiagnosticContainer> &DocumentAnnotationsChangedMessage::diagnostics() const
{
return diagnostics_;
}
const QVector<HighlightingMarkContainer> &DocumentAnnotationsChangedMessage::highlightingMarks() const
{
return highlightingMarks_;
}
const QVector<SourceRangeContainer> &HighlightingChangedMessage::skippedPreprocessorRanges() const
const QVector<SourceRangeContainer> &DocumentAnnotationsChangedMessage::skippedPreprocessorRanges() const
{
return skippedPreprocessorRanges_;
}
QDataStream &operator<<(QDataStream &out, const HighlightingChangedMessage &message)
QDataStream &operator<<(QDataStream &out, const DocumentAnnotationsChangedMessage &message)
{
out << message.file_;
out << message.fileContainer_;
out << message.diagnostics_;
out << message.highlightingMarks_;
out << message.skippedPreprocessorRanges_;
return out;
}
QDataStream &operator>>(QDataStream &in, HighlightingChangedMessage &message)
QDataStream &operator>>(QDataStream &in, DocumentAnnotationsChangedMessage &message)
{
in >> message.file_;
in >> message.fileContainer_;
in >> message.diagnostics_;
in >> message.highlightingMarks_;
in >> message.skippedPreprocessorRanges_;
return in;
}
bool operator==(const HighlightingChangedMessage &first, const HighlightingChangedMessage &second)
bool operator==(const DocumentAnnotationsChangedMessage &first,
const DocumentAnnotationsChangedMessage &second)
{
return first.file_ == second.file_
return first.fileContainer_ == second.fileContainer_
&& first.diagnostics_ == second.diagnostics_
&& first.highlightingMarks_ == second.highlightingMarks_
&& first.skippedPreprocessorRanges_ == second.skippedPreprocessorRanges_;
}
QDebug operator<<(QDebug debug, const HighlightingChangedMessage &message)
QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message)
{
debug.nospace() << "HighlightingChangedMessage("
<< message.file_
debug.nospace() << "DocumentAnnotationsChangedMessage("
<< message.fileContainer_
<< ", " << message.diagnostics_.size()
<< ", " << message.highlightingMarks_.size()
<< ", " << message.skippedPreprocessorRanges_.size()
<< ")";
@@ -92,10 +105,11 @@ QDebug operator<<(QDebug debug, const HighlightingChangedMessage &message)
return debug;
}
void PrintTo(const HighlightingChangedMessage &message, ::std::ostream* os)
void PrintTo(const DocumentAnnotationsChangedMessage &message, ::std::ostream* os)
{
*os << "HighlightingChangedMessage(";
PrintTo(message.file(), os);
*os << "DocumentAnnotationsChangedMessage(";
PrintTo(message.fileContainer(), os);
*os << "," << message.diagnostics().size();
*os << "," << message.highlightingMarks().size();
*os << "," << message.skippedPreprocessorRanges().size();
*os << ")";

40
src/libs/clangbackendipc/highlightingchangedmessage.h → src/libs/clangbackendipc/documentannotationschangedmessage.h
View File

@@ -26,6 +26,7 @@
#pragma once
#include "clangbackendipc_global.h"
#include "diagnosticcontainer.h"
#include "filecontainer.h"
#include "highlightingmarkcontainer.h"
#include "sourcerangecontainer.h"
@@ -34,36 +35,39 @@
namespace ClangBackEnd {
class CMBIPC_EXPORT HighlightingChangedMessage
class CMBIPC_EXPORT DocumentAnnotationsChangedMessage
{
friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const HighlightingChangedMessage &message);
friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, HighlightingChangedMessage &message);
friend CMBIPC_EXPORT bool operator==(const HighlightingChangedMessage &first, const HighlightingChangedMessage &second);
friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const HighlightingChangedMessage &message);
friend void PrintTo(const HighlightingChangedMessage &message, ::std::ostream* os);
friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const DocumentAnnotationsChangedMessage &message);
friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, DocumentAnnotationsChangedMessage &message);
friend CMBIPC_EXPORT bool operator==(const DocumentAnnotationsChangedMessage &first, const DocumentAnnotationsChangedMessage &second);
friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message);
friend void PrintTo(const DocumentAnnotationsChangedMessage &message, ::std::ostream* os);
public:
HighlightingChangedMessage() = default;
HighlightingChangedMessage(const FileContainer &file,
const QVector<HighlightingMarkContainer> &highlightingMarks,
const QVector<SourceRangeContainer> &skippedPreprocessorRanges);
DocumentAnnotationsChangedMessage() = default;
DocumentAnnotationsChangedMessage(const FileContainer &fileContainer,
const QVector<DiagnosticContainer> &diagnostics,
const QVector<HighlightingMarkContainer> &highlightingMarks,
const QVector<SourceRangeContainer> &skippedPreprocessorRanges);
const FileContainer &file() const;
const FileContainer &fileContainer() const;
const QVector<DiagnosticContainer> &diagnostics() const;
const QVector<HighlightingMarkContainer> &highlightingMarks() const;
const QVector<SourceRangeContainer> &skippedPreprocessorRanges() const;
private:
FileContainer file_;
FileContainer fileContainer_;
QVector<DiagnosticContainer> diagnostics_;
QVector<HighlightingMarkContainer> highlightingMarks_;
QVector<SourceRangeContainer> skippedPreprocessorRanges_;
};
CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const HighlightingChangedMessage &message);
CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, HighlightingChangedMessage &message);
CMBIPC_EXPORT bool operator==(const HighlightingChangedMessage &first, const HighlightingChangedMessage &second);
CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const DocumentAnnotationsChangedMessage &message);
CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, DocumentAnnotationsChangedMessage &message);
CMBIPC_EXPORT bool operator==(const DocumentAnnotationsChangedMessage &first, const DocumentAnnotationsChangedMessage &second);
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const HighlightingChangedMessage &message);
void PrintTo(const HighlightingChangedMessage &message, ::std::ostream* os);
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message);
void PrintTo(const DocumentAnnotationsChangedMessage &message, ::std::ostream* os);
DECLARE_MESSAGE(HighlightingChangedMessage)
DECLARE_MESSAGE(DocumentAnnotationsChangedMessage)
} // namespace ClangBackEnd

20
src/libs/clangbackendipc/messageenvelop.cpp
View File

@@ -32,14 +32,12 @@
#include "cmbregistertranslationunitsforeditormessage.h"
#include "cmbunregisterprojectsforeditormessage.h"
#include "cmbunregistertranslationunitsforeditormessage.h"
#include "diagnosticschangedmessage.h"
#include "highlightingchangedmessage.h"
#include "documentannotationschangedmessage.h"
#include "messageenvelop.h"
#include "messageenvelop.h"
#include "projectpartsdonotexistmessage.h"
#include "registerunsavedfilesforeditormessage.h"
#include "requestdiagnosticsmessage.h"
#include "requesthighlightingmessage.h"
#include "requestdocumentannotations.h"
#include "translationunitdoesnotexistmessage.h"
#include "unregisterunsavedfilesforeditormessage.h"
#include "updatetranslationunitsforeditormessage.h"
@@ -79,11 +77,8 @@ QDebug operator<<(QDebug debug, const MessageEnvelop &messageEnvelop)
case MessageType::CompleteCodeMessage:
qDebug() << messageEnvelop.message<CompleteCodeMessage>();
break;
case MessageType::RequestDiagnosticsMessage:
qDebug() << messageEnvelop.message<RequestDiagnosticsMessage>();
break;
case MessageType::RequestHighlightingMessage:
qDebug() << messageEnvelop.message<RequestHighlightingMessage>();
case MessageType::RequestDocumentAnnotationsMessage:
qDebug() << messageEnvelop.message<RequestDocumentAnnotationsMessage>();
break;
case MessageType::UpdateVisibleTranslationUnitsMessage:
qDebug() << messageEnvelop.message<UpdateVisibleTranslationUnitsMessage>();
@@ -103,11 +98,8 @@ QDebug operator<<(QDebug debug, const MessageEnvelop &messageEnvelop)
case MessageType::ProjectPartsDoNotExistMessage:
qDebug() << messageEnvelop.message<ProjectPartsDoNotExistMessage>();
break;
case MessageType::DiagnosticsChangedMessage:
qDebug() << messageEnvelop.message<DiagnosticsChangedMessage>();
break;
case MessageType::HighlightingChangedMessage:
qDebug() << messageEnvelop.message<HighlightingChangedMessage>();
case MessageType::DocumentAnnotationsChangedMessage:
qDebug() << messageEnvelop.message<DocumentAnnotationsChangedMessage>();
break;
default:
qWarning() << "Unknown Message";

79
src/libs/clangbackendipc/requestdiagnosticsmessage.cpp
View File

@@ -1,79 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "requestdiagnosticsmessage.h"
#include <QDataStream>
#include <QDebug>
#include <ostream>
namespace ClangBackEnd {
RequestDiagnosticsMessage::RequestDiagnosticsMessage(const FileContainer &file)
: file_(file)
{
}
const FileContainer RequestDiagnosticsMessage::file() const
{
return file_;
}
QDataStream &operator<<(QDataStream &out, const RequestDiagnosticsMessage &message)
{
out << message.file_;
return out;
}
QDataStream &operator>>(QDataStream &in, RequestDiagnosticsMessage &message)
{
in >> message.file_;
return in;
}
bool operator==(const RequestDiagnosticsMessage &first, const RequestDiagnosticsMessage &second)
{
return first.file_ == second.file_;
}
QDebug operator<<(QDebug debug, const RequestDiagnosticsMessage &message)
{
debug.nospace() << "RequestDiagnosticsMessage("
<< message.file()
<< ")";
return debug;
}
void PrintTo(const RequestDiagnosticsMessage &message, ::std::ostream* os)
{
*os << message.file().filePath().constData()
<< "(" << message.file().projectPartId().constData() << ")";
}
} // namespace ClangBackEnd

58
src/libs/clangbackendipc/requestdiagnosticsmessage.h
View File

@@ -1,58 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include "filecontainer.h"
namespace ClangBackEnd {
class CMBIPC_EXPORT RequestDiagnosticsMessage
{
friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RequestDiagnosticsMessage &message);
friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RequestDiagnosticsMessage &message);
friend CMBIPC_EXPORT bool operator==(const RequestDiagnosticsMessage &first, const RequestDiagnosticsMessage &second);
friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestDiagnosticsMessage &message);
friend void PrintTo(const RequestDiagnosticsMessage &message, ::std::ostream* os);
public:
RequestDiagnosticsMessage() = default;
RequestDiagnosticsMessage(const FileContainer &file);
const FileContainer file() const;
private:
FileContainer file_;
};
CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RequestDiagnosticsMessage &message);
CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RequestDiagnosticsMessage &message);
CMBIPC_EXPORT bool operator==(const RequestDiagnosticsMessage &first, const RequestDiagnosticsMessage &second);
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestDiagnosticsMessage &message);
void PrintTo(const RequestDiagnosticsMessage &message, ::std::ostream* os);
DECLARE_MESSAGE(RequestDiagnosticsMessage);
} // namespace ClangBackEnd

18
src/libs/clangbackendipc/requesthighlightingmessage.cpp → src/libs/clangbackendipc/requestdocumentannotations.cpp
View File

@@ -23,7 +23,7 @@
**
****************************************************************************/
#include "requesthighlightingmessage.h"
#include "requestdocumentannotations.h"
#include <QDataStream>
#include <QDebug>
@@ -32,45 +32,45 @@
namespace ClangBackEnd {
RequestHighlightingMessage::RequestHighlightingMessage(const FileContainer &file)
RequestDocumentAnnotationsMessage::RequestDocumentAnnotationsMessage(const FileContainer &file)
: fileContainer_(file)
{
}
const FileContainer RequestHighlightingMessage::fileContainer() const
const FileContainer RequestDocumentAnnotationsMessage::fileContainer() const
{
return fileContainer_;
}
QDataStream &operator<<(QDataStream &out, const RequestHighlightingMessage &message)
QDataStream &operator<<(QDataStream &out, const RequestDocumentAnnotationsMessage &message)
{
out << message.fileContainer_;
return out;
}
QDataStream &operator>>(QDataStream &in, RequestHighlightingMessage &message)
QDataStream &operator>>(QDataStream &in, RequestDocumentAnnotationsMessage &message)
{
in >> message.fileContainer_;
return in;
}
bool operator==(const RequestHighlightingMessage &first, const RequestHighlightingMessage &second)
bool operator==(const RequestDocumentAnnotationsMessage &first, const RequestDocumentAnnotationsMessage &second)
{
return first.fileContainer_ == second.fileContainer_;
}
QDebug operator<<(QDebug debug, const RequestHighlightingMessage &message)
QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message)
{
debug.nospace() << "RequestHighlightingMessage("
debug.nospace() << "RequestDocumentAnnotationsMessage("
<< message.fileContainer()
<< ")";
return debug;
}
void PrintTo(const RequestHighlightingMessage &message, ::std::ostream* os)
void PrintTo(const RequestDocumentAnnotationsMessage &message, ::std::ostream* os)
{
*os << message.fileContainer().filePath().constData()
<< "(" << message.fileContainer().projectPartId().constData() << ")";

28
src/libs/clangbackendipc/requesthighlightingmessage.h → src/libs/clangbackendipc/requestdocumentannotations.h
View File

@@ -29,17 +29,17 @@
namespace ClangBackEnd {
class CMBIPC_EXPORT RequestHighlightingMessage
class CMBIPC_EXPORT RequestDocumentAnnotationsMessage
{
friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RequestHighlightingMessage &message);
friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RequestHighlightingMessage &message);
friend CMBIPC_EXPORT bool operator==(const RequestHighlightingMessage &first, const RequestHighlightingMessage &second);
friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestHighlightingMessage &message);
friend void PrintTo(const RequestHighlightingMessage &message, ::std::ostream* os);
friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RequestDocumentAnnotationsMessage &message);
friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RequestDocumentAnnotationsMessage &message);
friend CMBIPC_EXPORT bool operator==(const RequestDocumentAnnotationsMessage &first, const RequestDocumentAnnotationsMessage &second);
friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message);
friend void PrintTo(const RequestDocumentAnnotationsMessage &message, ::std::ostream* os);
public:
RequestHighlightingMessage() = default;
RequestHighlightingMessage(const FileContainer &fileContainer);
RequestDocumentAnnotationsMessage() = default;
RequestDocumentAnnotationsMessage(const FileContainer &fileContainer);
const FileContainer fileContainer() const;
@@ -47,12 +47,12 @@ private:
FileContainer fileContainer_;
};
CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RequestHighlightingMessage &message);
CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RequestHighlightingMessage &message);
CMBIPC_EXPORT bool operator==(const RequestHighlightingMessage &first, const RequestHighlightingMessage &second);
CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const RequestDocumentAnnotationsMessage &message);
CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, RequestDocumentAnnotationsMessage &message);
CMBIPC_EXPORT bool operator==(const RequestDocumentAnnotationsMessage &first, const RequestDocumentAnnotationsMessage &second);
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestHighlightingMessage &message);
void PrintTo(const RequestHighlightingMessage &message, ::std::ostream* os);
CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message);
void PrintTo(const RequestDocumentAnnotationsMessage &message, ::std::ostream* os);
DECLARE_MESSAGE(RequestHighlightingMessage)
DECLARE_MESSAGE(RequestDocumentAnnotationsMessage);
} // namespace ClangBackEnd