Sort and force grouping of includes (#4172)

This change enforces strict include grouping using IncludeCategories

In addition to adding this to the .clang-format file and applying it in the tests/src and src directories, I also did the following small changes:

    In ChatterSet.hpp, I changed lrucache to a <>include
    In Irc2.hpp, I change common/SignalVector.hpp to a "project-include"
    In AttachedWindow.cpp, NativeMessaging.cpp, WindowsHelper.hpp, BaseWindow.cpp, and StreamerMode.cpp, I disabled clang-format for the windows-includes
    In WindowDescriptors.hpp, I added the missing vector include. It was previously not needed because the include was handled by another file that was previously included first.
    clang-format minimum version has been bumped, so Ubuntu version used in the check-formatting job has been bumped to 22.04 (which is the latest LTS)

src/controllers/accounts/AccountController.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVector.hpp"
 #include "common/Singleton.hpp"
 #include "providers/twitch/TwitchAccountManager.hpp"
 #include "util/SharedPtrElementLess.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class Account;

src/controllers/commands/Command.hpp

@@ -2,8 +2,8 @@
 
 #include "util/RapidjsonHelpers.hpp"
 
-#include <QString>
 #include <pajlada/serialize.hpp>
+#include <QString>
 
 namespace chatterino {
 

src/controllers/commands/CommandController.cpp

@@ -5,19 +5,19 @@
 #include "common/QLogging.hpp"
 #include "common/SignalVector.hpp"
 #include "controllers/accounts/AccountController.hpp"
+#include "controllers/commands/builtin/twitch/ChatSettings.hpp"
 #include "controllers/commands/Command.hpp"
 #include "controllers/commands/CommandModel.hpp"
-#include "controllers/commands/builtin/twitch/ChatSettings.hpp"
 #include "controllers/userdata/UserDataController.hpp"
 #include "messages/Message.hpp"
 #include "messages/MessageBuilder.hpp"
 #include "messages/MessageElement.hpp"
 #include "providers/irc/IrcChannel2.hpp"
 #include "providers/irc/IrcServer.hpp"
+#include "providers/twitch/api/Helix.hpp"
 #include "providers/twitch/TwitchCommon.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
-#include "providers/twitch/api/Helix.hpp"
 #include "singletons/Emotes.hpp"
 #include "singletons/Paths.hpp"
 #include "singletons/Settings.hpp"
@@ -29,14 +29,14 @@
 #include "util/Helpers.hpp"
 #include "util/IncognitoBrowser.hpp"
 #include "util/Qt.hpp"
-#include "util/StreamLink.hpp"
 #include "util/StreamerMode.hpp"
+#include "util/StreamLink.hpp"
 #include "util/Twitch.hpp"
-#include "widgets/Window.hpp"
 #include "widgets/dialogs/ReplyThreadPopup.hpp"
 #include "widgets/dialogs/UserInfoPopup.hpp"
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"
+#include "widgets/Window.hpp"
 
 #include <QApplication>
 #include <QDesktopServices>

src/controllers/commands/CommandController.hpp

@@ -7,8 +7,8 @@
 #include "controllers/commands/CommandContext.hpp"
 #include "providers/twitch/TwitchChannel.hpp"
 
-#include <QMap>
 #include <pajlada/settings.hpp>
+#include <QMap>
 
 #include <memory>
 #include <mutex>

src/controllers/commands/CommandModel.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVectorModel.hpp"
 #include "controllers/commands/Command.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class CommandController;

src/controllers/commands/builtin/twitch/ChatSettings.cpp

@@ -3,8 +3,8 @@
 #include "Application.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "messages/MessageBuilder.hpp"
-#include "providers/twitch/TwitchChannel.hpp"
 #include "providers/twitch/api/Helix.hpp"
+#include "providers/twitch/TwitchChannel.hpp"
 #include "util/FormatTime.hpp"
 #include "util/Helpers.hpp"
 

src/controllers/filters/FilterModel.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVectorModel.hpp"
 #include "controllers/filters/FilterRecord.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class FilterModel : public SignalVectorModel<FilterRecordPtr>

src/controllers/filters/FilterRecord.hpp

@@ -1,15 +1,14 @@
 #pragma once
 
-#include "util/RapidJsonSerializeQString.hpp"
-#include "util/RapidjsonHelpers.hpp"
-
 #include "controllers/filters/parser/FilterParser.hpp"
 #include "controllers/filters/parser/Types.hpp"
+#include "util/RapidjsonHelpers.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 
+#include <pajlada/serialize.hpp>
 #include <QRegularExpression>
 #include <QString>
 #include <QUuid>
-#include <pajlada/serialize.hpp>
 
 #include <memory>
 

src/controllers/filters/parser/Tokenizer.cpp

@@ -1,4 +1,5 @@
 #include "controllers/filters/parser/Tokenizer.hpp"
+
 #include "common/QLogging.hpp"
 
 namespace filterparser {

src/controllers/highlights/BadgeHighlightModel.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVectorModel.hpp"
 #include "controllers/highlights/HighlightBadge.hpp"
 #include "providers/twitch/TwitchBadges.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class HighlightController;

src/controllers/highlights/HighlightBadge.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
 #include "providers/twitch/TwitchBadge.hpp"
-#include "util/RapidJsonSerializeQString.hpp"
 #include "util/RapidjsonHelpers.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 
+#include <pajlada/serialize.hpp>
 #include <QString>
 #include <QUrl>
-#include <pajlada/serialize.hpp>
 
 namespace chatterino {
 class HighlightBadge

src/controllers/highlights/HighlightBlacklistModel.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVectorModel.hpp"
 #include "controllers/highlights/HighlightBlacklistUser.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class HighlightController;

src/controllers/highlights/HighlightBlacklistUser.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "util/RapidJsonSerializeQString.hpp"
 #include "util/RapidjsonHelpers.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 
+#include <pajlada/serialize.hpp>
 #include <QRegularExpression>
 #include <QString>
-#include <pajlada/serialize.hpp>
 
 #include <memory>
 

src/controllers/highlights/HighlightController.hpp

@@ -7,9 +7,9 @@
 #include "singletons/Paths.hpp"
 #include "singletons/Settings.hpp"
 
+#include <boost/optional.hpp>
 #include <QColor>
 #include <QUrl>
-#include <boost/optional.hpp>
 
 #include <functional>
 #include <memory>

src/controllers/highlights/HighlightModel.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVectorModel.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class HighlightModel : public SignalVectorModel<HighlightPhrase>

src/controllers/highlights/HighlightPhrase.hpp

@@ -1,14 +1,14 @@
 #pragma once
 
 #include "providers/colors/ColorProvider.hpp"
-#include "util/RapidJsonSerializeQString.hpp"
 #include "util/RapidjsonHelpers.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 
+#include <pajlada/serialize.hpp>
 #include <QColor>
 #include <QRegularExpression>
 #include <QString>
 #include <QUrl>
-#include <pajlada/serialize.hpp>
 
 #include <memory>
 

src/controllers/highlights/UserHighlightModel.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVectorModel.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class HighlightController;

src/controllers/ignores/IgnoreModel.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVectorModel.hpp"
 #include "controllers/ignores/IgnorePhrase.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class IgnoreModel : public SignalVectorModel<IgnorePhrase>

src/controllers/ignores/IgnorePhrase.hpp

@@ -3,13 +3,12 @@
 #include "Application.hpp"
 #include "controllers/accounts/AccountController.hpp"
 #include "singletons/Settings.hpp"
-
-#include "util/RapidJsonSerializeQString.hpp"
 #include "util/RapidjsonHelpers.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 
+#include <pajlada/serialize.hpp>
 #include <QRegularExpression>
 #include <QString>
-#include <pajlada/serialize.hpp>
 
 #include <memory>
 

src/controllers/moderationactions/ModerationAction.cpp

@@ -1,10 +1,11 @@
 #include "ModerationAction.hpp"
 
-#include <QRegularExpression>
 #include "Application.hpp"
 #include "messages/Image.hpp"
 #include "singletons/Resources.hpp"
 
+#include <QRegularExpression>
+
 namespace chatterino {
 
 // ModerationAction::ModerationAction(Image *_image, const QString &_action)

src/controllers/moderationactions/ModerationAction.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QString>
+#include "util/RapidjsonHelpers.hpp"
+
 #include <boost/optional.hpp>
 #include <pajlada/serialize.hpp>
-
-#include "util/RapidjsonHelpers.hpp"
+#include <QString>
 
 #include <memory>
 

src/controllers/moderationactions/ModerationActionModel.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVectorModel.hpp"
 #include "controllers/moderationactions/ModerationAction.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class ModerationActionModel : public SignalVectorModel<ModerationAction>

src/controllers/nicknames/Nickname.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
 #include "controllers/accounts/AccountController.hpp"
-#include "util/RapidJsonSerializeQString.hpp"
 #include "util/RapidjsonHelpers.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 
-#include <QString>
 #include <pajlada/serialize.hpp>
+#include <QString>
 
 #include <memory>
 

src/controllers/nicknames/NicknamesModel.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVectorModel.hpp"
 #include "controllers/nicknames/Nickname.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class NicknamesModel : public SignalVectorModel<Nickname>

src/controllers/notifications/NotificationController.cpp

@@ -5,9 +5,9 @@
 #include "common/Outcome.hpp"
 #include "common/QLogging.hpp"
 #include "controllers/notifications/NotificationModel.hpp"
+#include "providers/twitch/api/Helix.hpp"
 #include "providers/twitch/TwitchIrcServer.hpp"
 #include "providers/twitch/TwitchMessageBuilder.hpp"
-#include "providers/twitch/api/Helix.hpp"
 #include "singletons/Toasts.hpp"
 #include "singletons/WindowManager.hpp"
 #include "util/Helpers.hpp"
@@ -21,6 +21,7 @@
 #include <QDir>
 #include <QMediaPlayer>
 #include <QUrl>
+
 #include <unordered_set>
 
 namespace chatterino {

src/controllers/notifications/NotificationModel.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVectorModel.hpp"
 #include "controllers/notifications/NotificationController.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class NotificationController;

src/controllers/pings/MutedChannelModel.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <QObject>
-
 #include "common/SignalVectorModel.hpp"
 #include "controllers/notifications/NotificationController.hpp"
 
+#include <QObject>
+
 namespace chatterino {
 
 class MutedChannelController;

src/controllers/userdata/UserData.hpp

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "util/RapidJsonSerializeQString.hpp"
 #include "util/RapidjsonHelpers.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 
-#include <QColor>
-#include <QString>
 #include <boost/optional.hpp>
 #include <pajlada/serialize.hpp>
+#include <QColor>
+#include <QString>
 
 namespace chatterino {
 

src/controllers/userdata/UserDataController.hpp

@@ -3,14 +3,14 @@
 #include "common/Singleton.hpp"
 #include "controllers/userdata/UserData.hpp"
 #include "util/QStringHash.hpp"
-#include "util/RapidJsonSerializeQString.hpp"
 #include "util/RapidjsonHelpers.hpp"
+#include "util/RapidJsonSerializeQString.hpp"
 #include "util/serialize/Container.hpp"
 
-#include <QColor>
-#include <QString>
 #include <boost/optional.hpp>
 #include <pajlada/settings.hpp>
+#include <QColor>
+#include <QString>
 
 #include <shared_mutex>
 #include <unordered_map>