Avoid false positive warnings for QT signals and slots extended syntax.

tkruse · tkruse · commit b72d3f8dc984 · 2020-06-22T10:27:47.000+09:00
This reuses the same regex snippet as in Update()

Note that QT also allows to use macros instead of keywords: Q_SIGNAL, Q_SIGNALS, Q_SLOT, Q_SLOTS, but apparently this is not used not frequently enough to include in cpplint.
diff --git a/cpplint.py b/cpplint.py
@@ -4803,7 +4803,7 @@ def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state,
   # if(match($0, " <<")) complain = 0;
   # if(match(prev, " +for \\(")) complain = 0;
   # if(prevodd && match(prevprev, " +for \\(")) complain = 0;
-  scope_or_label_pattern = r'\s*\w+\s*:\s*\\?$'
+  scope_or_label_pattern = r'\s*(?:public|private|protected|signals)(?:\s+(?:slots\s*)?)?:\s*\\?$'
   classinfo = nesting_state.InnermostClass()
   initial_spaces = 0
   cleansed_line = clean_lines.elided[linenum]
diff --git a/cpplint_unittest.py b/cpplint_unittest.py
@@ -3712,14 +3712,31 @@ def testIndent(self):
     self.TestLint(' protected: \\', '')
     self.TestLint('  public:      \\', '')
     self.TestLint('   private:   \\', '')
+    # examples using QT signals/slots macro
     self.TestMultiLineLint(
         TrimExtraIndent("""
             class foo {
              public slots:
               void bar();
+             signals:
             };"""),
-        'Weird number of spaces at line-start.  '
-        'Are you using a 2-space indent?  [whitespace/indent] [3]')
+        '')
+    self.TestMultiLineLint(
+        TrimExtraIndent("""
+            class foo {
+              public slots:
+              void bar();
+            };"""),
+        'public slots: should be indented +1 space inside class foo'
+        '  [whitespace/indent] [3]')
+    self.TestMultiLineLint(
+        TrimExtraIndent("""
+            class foo {
+              signals:
+              void bar();
+            };"""),
+        'signals: should be indented +1 space inside class foo'
+        '  [whitespace/indent] [3]')
     self.TestMultiLineLint(
         TrimExtraIndent('''
             static const char kRawString[] = R"("
