[pre-commit.ci] pre-commit autoupdate (#410)

pre-commit-ci[bot] · web-flow · commit 03adc574601a · 2025-09-02T07:23:56.000+02:00
* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/pre-commit/mirrors-clang-format: v20.1.8 → v21.1.0](pre-commit/mirrors-clang-format@v20.1.8...v21.1.0) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -45,7 +45,7 @@ repos:
         name: check .editorconfig rules
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v20.1.8
+    rev: v21.1.0
     hooks:
       - id: clang-format
 
diff --git a/cpp-terminal/buffer.cpp b/cpp-terminal/buffer.cpp
@@ -71,7 +71,8 @@ Term::Buffer::int_type Term::Buffer::underflow()
     m_buffer.clear();
     if(terminal.getOptions().has(Option::Raw))
     {
-      do {
+      do
+      {
         std::string ret{Term::Private::in.read()};
         if(!ret.empty())
         {
@@ -96,7 +97,8 @@ Term::Buffer::int_type Term::Buffer::underflow()
     }
     else
     {
-      do {
+      do
+      {
         std::string ret{Term::Private::in.read()};
         m_buffer += ret;
       } while(m_buffer.empty());
diff --git a/cpp-terminal/event.hpp b/cpp-terminal/event.hpp
@@ -48,12 +48,12 @@ class Event
   Event& operator=(const Term::Event& event);
   bool   empty() const;
   Type   type() const;
-  operator Term::Key() const;
-  operator Term::Screen() const;
-  operator Term::Cursor() const;
-  operator Term::Focus() const;
-  operator Term::Mouse() const;
-  operator std::string() const;
+         operator Term::Key() const;
+         operator Term::Screen() const;
+         operator Term::Cursor() const;
+         operator Term::Focus() const;
+         operator Term::Mouse() const;
+         operator std::string() const;
 
   // getters
   Key*               get_if_key();
diff --git a/cpp-terminal/private/exception.cpp b/cpp-terminal/private/exception.cpp
@@ -57,7 +57,10 @@ Term::Exception::Exception(const std::int64_t& code) noexcept : m_code(code) {}
 void Term::Exception::build_what() const noexcept
 {
   if(0 == m_code) { m_what = m_message; }
-  else { m_what = "error " + std::to_string(m_code) + ": " + m_message; }
+  else
+  {
+    m_what = "error " + std::to_string(m_code) + ": " + m_message;
+  }
 }
 
 void Term::Exception::setMessage(const std::string& message) noexcept { m_message = message; }
@@ -100,7 +103,10 @@ Term::Private::WindowsException::WindowsException(const std::int64_t& error, con
     if(ret.size() >= 2 && ret[ret.size() - 1] == '\n' && ret[ret.size() - 2] == '\r') ret.erase(ret.size() - 2);
     setMessage(ret);
   }
-  else { throw Term::Exception(::GetLastError(), "Error in FormatMessageW"); }
+  else
+  {
+    throw Term::Exception(::GetLastError(), "Error in FormatMessageW");
+  }
 }
 
 void Term::Private::WindowsException::build_what() const noexcept
diff --git a/cpp-terminal/private/file.cpp b/cpp-terminal/private/file.cpp
@@ -67,7 +67,10 @@ try : m_mutex(mutex)
   flag &= ~static_cast<std::size_t>(O_NONBLOCK);
   if(mode.find('r') != std::string::npos) { flag |= O_RDONLY; }       //NOLINT(abseil-string-find-str-contains)
   else if(mode.find('w') != std::string::npos) { flag |= O_WRONLY; }  //NOLINT(abseil-string-find-str-contains)
-  else { flag |= O_RDWR; }
+  else
+  {
+    flag |= O_RDWR;
+  }
   m_fd = {::open(file.c_str(), static_cast<int>(flag))};  //NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
   if(m_fd == -1)
   {
diff --git a/cpp-terminal/private/sigwinch.cpp b/cpp-terminal/private/sigwinch.cpp
@@ -29,7 +29,10 @@ volatile std::sig_atomic_t m_signalStatus{0};
 static void                sigwinchHandler(int sig)
 {
   if(sig == SIGWINCH) { m_signalStatus = 1; }
-  else { m_signalStatus = 0; }
+  else
+  {
+    m_signalStatus = 0;
+  }
 }
 }  // namespace Private
 }  // namespace Term
diff --git a/cpp-terminal/private/terminfo.cpp b/cpp-terminal/private/terminfo.cpp
@@ -154,7 +154,10 @@ void Term::Terminfo::checkColorMode()
   else if(WindowsVersionGreater(10, 0, 10586) && !m_booleans[static_cast<std::size_t>(Terminfo::Bool::Legacy)]) { m_colorMode = Term::Terminfo::ColorMode::Bit24; }
   else if(m_booleans[static_cast<std::size_t>(Terminfo::Bool::Legacy)]) { m_colorMode = Term::Terminfo::ColorMode::Bit4; }
 #endif
-  else { m_colorMode = Term::Terminfo::ColorMode::Bit24; }
+  else
+  {
+    m_colorMode = Term::Terminfo::ColorMode::Bit24;
+  }
   std::string colorterm = Private::getenv("COLORTERM").second;
   if((colorterm == "truecolor" || colorterm == "24bit") && m_colorMode != ColorMode::Unset) { m_colorMode = Term::Terminfo::ColorMode::Bit24; }
 }
@@ -163,7 +166,10 @@ void Term::Terminfo::checkControlSequences()
 {
 #ifdef _WIN32
   if(WindowsVersionGreater(10, 0, 10586)) { set(Term::Terminfo::Bool::ControlSequences, true); }
-  else { set(Term::Terminfo::Bool::ControlSequences, false); }
+  else
+  {
+    set(Term::Terminfo::Bool::ControlSequences, false);
+  }
 #else
   set(Term::Terminfo::Bool::ControlSequences, true);
 #endif
@@ -180,7 +186,10 @@ void Term::Terminfo::checkUTF8()
   Term::Cursor cursor_after{Term::cursor_position()};
   std::size_t  moved{cursor_after.column() - cursor_before.column()};
   if(moved == 1) { set(Terminfo::Bool::UTF8, true); }
-  else { set(Terminfo::Bool::UTF8, false); }
+  else
+  {
+    set(Terminfo::Bool::UTF8, false);
+  }
   for(std::size_t i = 0; i != moved; ++i) { Term::Private::out.write("\b \b"); }
 #endif
 }
diff --git a/cpp-terminal/private/unicode.cpp b/cpp-terminal/private/unicode.cpp
@@ -68,7 +68,10 @@ std::string Term::Private::utf32_to_utf8(const char32_t& codepoint, const bool&
   else if(codepoint <= size[2]) { ret = {static_cast<char>(((codepoint >> shift[2]) & mask_first[1]) | add_first[1]), static_cast<char>(((codepoint >> shift[1]) & add) | mask), static_cast<char>(((codepoint >> shift[0]) & add) | mask)}; }
   else if(codepoint <= size[3]) { ret = {static_cast<char>(((codepoint >> shift[3]) & mask_first[2]) | add_first[2]), static_cast<char>(((codepoint >> shift[2]) & add) | mask), static_cast<char>(((codepoint >> shift[1]) & add) | mask), static_cast<char>(((codepoint >> shift[0]) & add) | mask)}; }
   else if(exception) { throw Term::Exception("Invalid UTF32 codepoint."); }
-  else { ret = "\xEF\xBF\xBD"; }
+  else
+  {
+    ret = "\xEF\xBF\xBD";
+  }
   return ret;
 }
 
diff --git a/cpp-terminal/prompt.cpp b/cpp-terminal/prompt.cpp
@@ -161,7 +161,10 @@ std::vector<std::string> Term::split(const std::string& s)
       j++;
       lines.emplace_back("");
     }
-    else { lines[j].push_back(s[i]); }
+    else
+    {
+      lines[j].push_back(s[i]);
+    }
   }
   return lines;
 }
@@ -345,7 +348,10 @@ std::string Term::prompt_multiline(const std::string& prompt_string, std::vector
             // Not at the bottom row, can't push back
             model.lines.insert(model.lines.begin() + static_cast<long>(model.cursor_row), after);
           }
-          else { model.lines.push_back(after); }
+          else
+          {
+            model.lines.push_back(after);
+          }
           model.cursor_col = 1;
           model.cursor_row++;
           if(model.lines.size() > scr.columns()) { scr.set_h(model.lines.size()); }
diff --git a/cpp-terminal/window.cpp b/cpp-terminal/window.cpp
@@ -46,7 +46,10 @@ const Rows& Term::Window::rows() const noexcept { return m_size.rows(); }
 void Term::Window::set_char(const std::size_t& column, const std::size_t& row, const char32_t& character)
 {
   if(insideWindow(column, row)) { m_chars[index(column, row)] = character; }
-  else { throw Term::Exception("set_char(): (x,y) out of bounds"); }
+  else
+  {
+    throw Term::Exception("set_char(): (x,y) out of bounds");
+  }
 }
 
 void Term::Window::set_fg_reset(const std::size_t& column, const std::size_t& row)
@@ -91,7 +94,10 @@ void Term::Window::set_h(const std::size_t& new_h)
     m_style.insert(m_style.end(), dc, Style::Reset);
     m_size = {Term::Columns(m_size.columns()), Term::Rows(new_h)};
   }
-  else { throw Term::Exception("Shrinking height not supported."); }
+  else
+  {
+    throw Term::Exception("Shrinking height not supported.");
+  }
 }
 
 void Term::Window::print_str(const std::size_t& x, const std::size_t& y, const std::string& s, const std::size_t& indent, bool move_cursor)
@@ -109,12 +115,18 @@ void Term::Window::print_str(const std::size_t& x, const std::size_t& y, const s
       {
         for(std::size_t j = 0; j < indent; ++j) { set_char(x + j, ypos, '.'); }
       }
-      else { return; }
+      else
+      {
+        return;
+      }
     }
     else
     {
       if(insideWindow(xpos, ypos)) { set_char(xpos, y, i); }
-      else { return; }
+      else
+      {
+        return;
+      }
       ++xpos;
     }
   }
diff --git a/examples/attach_console.cpp b/examples/attach_console.cpp
@@ -33,7 +33,10 @@ int main()
     else if(Term::Terminfo::getColorMode() == Term::Terminfo::ColorMode::Bit4) { mode = "4bit"; }
     else if(Term::Terminfo::getColorMode() == Term::Terminfo::ColorMode::Bit3) { mode = "3bit"; }
     else if(Term::Terminfo::getColorMode() == Term::Terminfo::ColorMode::NoColor) { mode = "nocolor"; }
-    else { mode = "Unset"; }
+    else
+    {
+      mode = "Unset";
+    }
     std::cout << "Terminal has " << mode << " color support\n" << std::endl;
 
     std::string text = "Some text with " + Term::color_fg(Term::Color::Name::Red) + color_bg(Term::Color::Name::Green) + "red on green" + color_bg(Term::Color::Name::Default) + color_fg(Term::Color::Name::Default);
diff --git a/examples/cin_raw.cpp b/examples/cin_raw.cpp
@@ -34,7 +34,10 @@ int main()
   while((event = Term::read_event()) != Term::Key(Term::Key::Ctrl_C))
   {
     if(event.isprint()) { std::cout << "You typed :" << static_cast<char>(event) << std::endl; }
-    else { std::cout << "You typed key :" << static_cast<std::uint32_t>(event) << std::endl; }
+    else
+    {
+      std::cout << "You typed key :" << static_cast<std::uint32_t>(event) << std::endl;
+    }
   }
   return 0;
 }
diff --git a/examples/colors.cpp b/examples/colors.cpp
@@ -23,15 +23,21 @@ int main()
   try
   {
     if(Term::is_stdout_a_tty()) { Term::cout << "Standard output is attached to a terminal." << std::endl << std::endl; }
-    else { Term::cout << "Standard output is not attached to a terminal." << std::endl << std::endl; }
+    else
+    {
+      Term::cout << "Standard output is not attached to a terminal." << std::endl << std::endl;
+    }
 
     std::string mode;
     if(Term::Terminfo::getColorMode() == Term::Terminfo::ColorMode::Bit24) { mode = "24bit"; }
     else if(Term::Terminfo::getColorMode() == Term::Terminfo::ColorMode::Bit8) { mode = "8bit"; }
     else if(Term::Terminfo::getColorMode() == Term::Terminfo::ColorMode::Bit4) { mode = "4bit"; }
     else if(Term::Terminfo::getColorMode() == Term::Terminfo::ColorMode::Bit3) { mode = "3bit"; }
     else if(Term::Terminfo::getColorMode() == Term::Terminfo::ColorMode::NoColor) { mode = "nocolor"; }
-    else { mode = "Unset"; }
+    else
+    {
+      mode = "Unset";
+    }
 
     Term::cout << "Terminal has " << mode << " color support" << std::endl << std::endl;
 
diff --git a/examples/events.cpp b/examples/events.cpp
@@ -60,7 +60,10 @@ int main()
         case Term::Event::Type::Focus:
         {
           if(static_cast<Term::Focus>(event).in()) { Term::cout << "Event: Focus (In)" << std::endl; }
-          else { Term::cout << "Event: Focus (Out)" << std::endl; }
+          else
+          {
+            Term::cout << "Event: Focus (Out)" << std::endl;
+          }
           break;
         }
         case Term::Event::Type::Key:
diff --git a/examples/keys.cpp b/examples/keys.cpp
@@ -41,7 +41,10 @@ int main()
         {
           Term::Key key(event);
           if(key == Term::Key::q) { quit++; }
-          else { quit = 0; }
+          else
+          {
+            quit = 0;
+          }
           Term::cout << "Key: " << key.name() << " (" << static_cast<std::int32_t>(key) << ")" << std::endl;
           break;
         }
diff --git a/examples/kilo.cpp b/examples/kilo.cpp
@@ -348,7 +348,10 @@ void editorUpdateRow(erow* row)
       row->render[idx++] = ' ';
       while(idx % KILO_TAB_STOP != 0) row->render[idx++] = ' ';
     }
-    else { row->render[idx++] = row->chars[j]; }
+    else
+    {
+      row->render[idx++] = row->chars[j];
+    }
   }
   row->render[idx] = '\0';
   row->rsize       = idx;
@@ -649,7 +652,10 @@ void editorDrawRows(std::string& screen)
         while(padding--) screen.append(" ");
         screen.append(welcome);
       }
-      else { screen.append("~"); }
+      else
+      {
+        screen.append("~");
+      }
     }
     else
     {
@@ -703,12 +709,18 @@ void editorDrawStatusBar(std::string& screen)
   screen.append(style(Term::Style::Reversed));
   std::string left1;
   if(!E.filename.empty()) { left1 += E.filename; }
-  else { left1 += "[No Name]"; }
+  else
+  {
+    left1 += "[No Name]";
+  }
   std::string left2 = " - " + std::to_string(E.numrows) + " lines ";
   if(E.dirty) { left2 += "(modified)"; }
   std::string right;
   if(!E.syntax.empty()) { right += E.syntax.filetype + " | "; }
-  else { right += "no ft | "; }
+  else
+  {
+    right += "no ft | ";
+  }
   right += std::to_string(E.cy + 1) + "/" + std::to_string(E.numrows);
   if((left1.size() + left2.size() + right.size()) < E.screencols) { screen += left1 + left2 + std::string(E.screencols - right.size() - left1.size() - left2.size(), ' ') + right; }
   else
@@ -926,7 +938,10 @@ bool editorProcessKeypress()
         {
           if(mouse.getButton().action() == Term::Button::Action::RolledDown) { ::editorMoveCursor(Term::Key::ArrowDown); }
           else if(mouse.getButton().action() == Term::Button::Action::RolledUp) { ::editorMoveCursor(Term::Key::ArrowUp); }
-          else { break; }
+          else
+          {
+            break;
+          }
         }
         default: break;
       }
diff --git a/examples/menu.cpp b/examples/menu.cpp
diff --git a/examples/utf8.cpp b/examples/utf8.cpp

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ Term::Buffer::int_type Term::Buffer::underflow()`
`71`	`71`	`m_buffer.clear();`
`72`	`72`	`if(terminal.getOptions().has(Option::Raw))`
`73`	`73`	`{`
`74`		`- do {`
	`74`	`+ do`
	`75`	`+ {`
`75`	`76`	`std::string ret{Term::Private::in.read()};`
`76`	`77`	`if(!ret.empty())`
`77`	`78`	`{`
`@@ -96,7 +97,8 @@ Term::Buffer::int_type Term::Buffer::underflow()`
`96`	`97`	`}`
`97`	`98`	`else`
`98`	`99`	`{`
`99`		`- do {`
	`100`	`+ do`
	`101`	`+ {`
`100`	`102`	`std::string ret{Term::Private::in.read()};`
`101`	`103`	`m_buffer += ret;`
`102`	`104`	`} while(m_buffer.empty());`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,10 @@ Term::Exception::Exception(const std::int64_t& code) noexcept : m_code(code) {}`
`57`	`57`	`void Term::Exception::build_what() const noexcept`
`58`	`58`	`{`
`59`	`59`	`if(0 == m_code) { m_what = m_message; }`
`60`		`- else { m_what = "error " + std::to_string(m_code) + ": " + m_message; }`
	`60`	`+ else`
	`61`	`+ {`
	`62`	`+ m_what = "error " + std::to_string(m_code) + ": " + m_message;`
	`63`	`+ }`
`61`	`64`	`}`
`62`	`65`
`63`	`66`	`void Term::Exception::setMessage(const std::string& message) noexcept { m_message = message; }`
`@@ -100,7 +103,10 @@ Term::Private::WindowsException::WindowsException(const std::int64_t& error, con`
`100`	`103`	`if(ret.size() >= 2 && ret[ret.size() - 1] == '\n' && ret[ret.size() - 2] == '\r') ret.erase(ret.size() - 2);`
`101`	`104`	`setMessage(ret);`
`102`	`105`	`}`
`103`		`- else { throw Term::Exception(::GetLastError(), "Error in FormatMessageW"); }`
	`106`	`+ else`
	`107`	`+ {`
	`108`	`+ throw Term::Exception(::GetLastError(), "Error in FormatMessageW");`
	`109`	`+ }`
`104`	`110`	`}`
`105`	`111`
`106`	`112`	`void Term::Private::WindowsException::build_what() const noexcept`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,10 @@ volatile std::sig_atomic_t m_signalStatus{0};`
`29`	`29`	`static void sigwinchHandler(int sig)`
`30`	`30`	`{`
`31`	`31`	`if(sig == SIGWINCH) { m_signalStatus = 1; }`
`32`		`- else { m_signalStatus = 0; }`
	`32`	`+ else`
	`33`	`+ {`
	`34`	`+ m_signalStatus = 0;`
	`35`	`+ }`
`33`	`36`	`}`
`34`	`37`	`} // namespace Private`
`35`	`38`	`} // namespace Term`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,10 @@ std::vector<std::string> Term::split(const std::string& s)`
`161`	`161`	`j++;`
`162`	`162`	`lines.emplace_back("");`
`163`	`163`	`}`
`164`		`- else { lines[j].push_back(s[i]); }`
	`164`	`+ else`
	`165`	`+ {`
	`166`	`+ lines[j].push_back(s[i]);`
	`167`	`+ }`
`165`	`168`	`}`
`166`	`169`	`return lines;`
`167`	`170`	`}`
`@@ -345,7 +348,10 @@ std::string Term::prompt_multiline(const std::string& prompt_string, std::vector`
`345`	`348`	`// Not at the bottom row, can't push back`
`346`	`349`	`model.lines.insert(model.lines.begin() + static_cast<long>(model.cursor_row), after);`
`347`	`350`	`}`
`348`		`- else { model.lines.push_back(after); }`
	`351`	`+ else`
	`352`	`+ {`
	`353`	`+ model.lines.push_back(after);`
	`354`	`+ }`
`349`	`355`	`model.cursor_col = 1;`
`350`	`356`	`model.cursor_row++;`
`351`	`357`	`if(model.lines.size() > scr.columns()) { scr.set_h(model.lines.size()); }`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,10 @@ const Rows& Term::Window::rows() const noexcept { return m_size.rows(); }`
`46`	`46`	`void Term::Window::set_char(const std::size_t& column, const std::size_t& row, const char32_t& character)`
`47`	`47`	`{`
`48`	`48`	`if(insideWindow(column, row)) { m_chars[index(column, row)] = character; }`
`49`		`- else { throw Term::Exception("set_char(): (x,y) out of bounds"); }`
	`49`	`+ else`
	`50`	`+ {`
	`51`	`+ throw Term::Exception("set_char(): (x,y) out of bounds");`
	`52`	`+ }`
`50`	`53`	`}`
`51`	`54`
`52`	`55`	`void Term::Window::set_fg_reset(const std::size_t& column, const std::size_t& row)`
`@@ -91,7 +94,10 @@ void Term::Window::set_h(const std::size_t& new_h)`
`91`	`94`	`m_style.insert(m_style.end(), dc, Style::Reset);`
`92`	`95`	`m_size = {Term::Columns(m_size.columns()), Term::Rows(new_h)};`
`93`	`96`	`}`
`94`		`- else { throw Term::Exception("Shrinking height not supported."); }`
	`97`	`+ else`
	`98`	`+ {`
	`99`	`+ throw Term::Exception("Shrinking height not supported.");`
	`100`	`+ }`
`95`	`101`	`}`
`96`	`102`
`97`	`103`	`void Term::Window::print_str(const std::size_t& x, const std::size_t& y, const std::string& s, const std::size_t& indent, bool move_cursor)`
`@@ -109,12 +115,18 @@ void Term::Window::print_str(const std::size_t& x, const std::size_t& y, const s`
`109`	`115`	`{`
`110`	`116`	`for(std::size_t j = 0; j < indent; ++j) { set_char(x + j, ypos, '.'); }`
`111`	`117`	`}`
`112`		`- else { return; }`
	`118`	`+ else`
	`119`	`+ {`
	`120`	`+ return;`
	`121`	`+ }`
`113`	`122`	`}`
`114`	`123`	`else`
`115`	`124`	`{`
`116`	`125`	`if(insideWindow(xpos, ypos)) { set_char(xpos, y, i); }`
`117`		`- else { return; }`
	`126`	`+ else`
	`127`	`+ {`
	`128`	`+ return;`
	`129`	`+ }`
`118`	`130`	`++xpos;`
`119`	`131`	`}`
`120`	`132`	`}`