Skip to content

Commit

Permalink
ci: Use clang-format 16 (Chatterino#4929)
Browse files Browse the repository at this point in the history
  • Loading branch information
pajlada authored Oct 31, 2023
1 parent f4726ed commit 5634687
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 11 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/check-formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,14 @@ jobs:
run: sudo apt-get update

- name: Install clang-format
run: sudo apt-get -y install clang-format dos2unix
run: sudo apt-get -y install dos2unix

- name: Check formatting
run: ./tools/check-format.sh
uses: DoozyX/[email protected]
with:
source: "./src ./tests/src ./benchmarks/src ./mocks/include"
extensions: "hpp,cpp"
clangFormatVersion: 16

- name: Check line-endings
run: ./tools/check-line-endings.sh
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- Bugfix: Fixed the input completion popup from disappearing when clicking on it on Windows and macOS. (#4876)
- Bugfix: Fixed double-click text selection moving its position with each new message. (#4898)
- Bugfix: Fixed an issue where notifications on Windows would contain no or an old avatar. (#4899)
- Dev: Change clang-format from v14 to v16. (#4929)
- Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791)
- Dev: Temporarily disable High DPI scaling on Qt6 builds on Windows. (#4767)
- Dev: Tests now run on Ubuntu 22.04 instead of 20.04 to loosen C++ restrictions in tests. (#4774)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ The code is formatted using clang format in Qt Creator. [.clang-format](src/.cla

### Get it automated with QT Creator + Beautifier + Clang Format

1. Download LLVM: https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.5/LLVM-15.0.5-win64.exe
1. Download LLVM: https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/LLVM-16.0.6-win64.exe
2. During the installation, make sure to add it to your path
3. In QT Creator, select `Help` > `About Plugins` > `C++` > `Beautifier` to enable the plugin
4. Restart QT Creator
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/hotkeys/HotkeyController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ QString HotkeyController::categoryName(HotkeyCategory category) const
return categoryData.name;
}

const std::map<HotkeyCategory, HotkeyCategoryData>
&HotkeyController::categories() const
const std::map<HotkeyCategory, HotkeyCategoryData> &
HotkeyController::categories() const
{
return this->hotkeyCategories_;
}
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/hotkeys/HotkeyController.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ class HotkeyController final : public Singleton
/**
* @returns a const map with the HotkeyCategory enum as its key, and HotkeyCategoryData as the value.
**/
[[nodiscard]] const std::map<HotkeyCategory, HotkeyCategoryData>
&categories() const;
[[nodiscard]] const std::map<HotkeyCategory, HotkeyCategoryData> &
categories() const;

pajlada::Signals::NoArgSignal onItemsUpdated;

Expand Down
4 changes: 2 additions & 2 deletions src/providers/twitch/TwitchChannel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1251,8 +1251,8 @@ void TwitchChannel::addReplyThread(const std::shared_ptr<MessageThread> &thread)
this->threads_[thread->rootId()] = thread;
}

const std::unordered_map<QString, std::weak_ptr<MessageThread>>
&TwitchChannel::threads() const
const std::unordered_map<QString, std::weak_ptr<MessageThread>> &
TwitchChannel::threads() const
{
return this->threads_;
}
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/splits/SplitContainer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -973,8 +973,8 @@ qreal SplitContainer::Node::getVerticalFlex() const
return this->flexV_;
}

const std::vector<std::unique_ptr<SplitContainer::Node>>
&SplitContainer::Node::getChildren()
const std::vector<std::unique_ptr<SplitContainer::Node>> &
SplitContainer::Node::getChildren()
{
return this->children_;
}
Expand Down

0 comments on commit 5634687

Please sign in to comment.