[clang-format] Add clang-format off/on regions + arrange comments

Some minor changes to get better results with clang-format with the current formatting.
dacap · Dec 14, 2024 · 8aa0cba · 8aa0cba
1 parent d109c79
commit 8aa0cba
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/base/base64.cpp b/base/base64.cpp
@@ -17,6 +17,8 @@
 
 namespace base {
 
+// clang-format off
+
 static const char base64Table[] = "ABCDEFGHIJKLMNOP"
                                   "QRSTUVWXYZabcdef"
                                   "ghijklmnopqrstuv"
@@ -36,6 +38,8 @@ static const int invBase64Table[] = {
  // From 112 to 122            'z'
  41,42,43,44,45,46,47,48,49,50,51 };
 
+// clang-format on
+
 static inline char base64Char(int index)
 {
   ASSERT(index >= 0 && index < 64);

diff --git a/base/scoped_value.h b/base/scoped_value.h
@@ -20,7 +20,8 @@ namespace base {
   public:
     ScopedValue(T& instance, const U inValue)
       : m_instance(instance)
-      , m_outValue(instance) { // Restore the current value
+      // Restore the current value
+      , m_outValue(instance) {
       m_instance = inValue;
     }
 

diff --git a/os/win/window.cpp b/os/win/window.cpp
@@ -92,8 +92,9 @@ static PointerType wt_packet_pkcursor_to_pointer_type(int pkCursor)
     case 0: return PointerType::Cursor;
     case 1: return PointerType::Pen;
     case 2: return PointerType::Eraser;
-    // TODO check if pkCursor=6 to notify about an inverted
-    //      stylus/eraser if we enable EnableMouseInPointer()
+    default:
+      // TODO check if pkCursor=6 to notify about an inverted
+      //      stylus/eraser if we enable EnableMouseInPointer()
   }
   // Impossible case (negative pkCursor?)
   ASSERT(false);
@@ -789,6 +790,7 @@ std::string WindowWin::getLayout()
   WINDOWPLACEMENT wp;
   wp.length = sizeof(WINDOWPLACEMENT);
   if (GetWindowPlacement(m_hwnd, &wp)) {
+    // clang-format off
     std::ostringstream s;
     s << 1 << ' '
       << wp.flags << ' '
@@ -802,6 +804,7 @@ std::string WindowWin::getLayout()
       << wp.rcNormalPosition.right << ' '
       << wp.rcNormalPosition.bottom;
     return s.str();
+    // clang-format on
   }
   return "";
 }
@@ -815,6 +818,7 @@ void WindowWin::setLayout(const std::string& layout)
   int ver;
   s >> ver;
   if (ver == 1) {
+    // clang-format off
     s >> wp.flags
       >> wp.showCmd
       >> wp.ptMinPosition.x
@@ -825,6 +829,7 @@ void WindowWin::setLayout(const std::string& layout)
       >> wp.rcNormalPosition.top
       >> wp.rcNormalPosition.right
       >> wp.rcNormalPosition.bottom;
+    // clang-format on
   }
   else
     return;