Changeset 243411 in webkit

Timestamp:

Mar 23, 2019 4:25:58 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK][WPE] check-webkit-style doesn't complain about identifiers with underscores in files under glib, gtk or wpe dirs
​https://bugs.webkit.org/show_bug.cgi?id=196143

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2019-03-23
Reviewed by Michael Catanzaro.

Fix the check for the exception of identifiers starting with webkit_ in files under glib, gtk or wpe
directories.

• Scripts/webkitpy/style/checkers/cpp.py:

(check_identifier_name_in_declaration):

• Scripts/webkitpy/style/checkers/cpp_unittest.py:

(WebKitStyleTest.test_names):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checkers/cpp.py (modified) (1 diff)
• Scripts/webkitpy/style/checkers/cpp_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-03-23  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][WPE] check-webkit-style doesn't complain about identifiers with underscores in files under glib, gtk or wpe dirs
+        https://bugs.webkit.org/show_bug.cgi?id=196143
+
+        Reviewed by Michael Catanzaro.
+
+        Fix the check for the exception of identifiers starting with webkit_ in files under glib, gtk or wpe
+        directories.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        (check_identifier_name_in_declaration):
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+        (WebKitStyleTest.test_names):
+
 2019-03-22  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py

@@ -3586 +3586 @@
             # Various exceptions to the rule: JavaScript op codes functions, const_iterator.
             if (not (filename.find('JavaScriptCore') >= 0 and (modified_identifier.find('op_') >= 0 or modified_identifier.find('intrinsic_') >= 0))
-                and not (('gtk' in filename or 'glib' in filename or 'wpe' in filename) and modified_identifier.startswith('webkit_') >= 0)
+                and not (('gtk' in filename or 'glib' in filename or 'wpe' in filename) and modified_identifier.startswith('webkit_'))
                 and not modified_identifier.startswith('tst_')
                 and not modified_identifier.startswith('webkit_dom_object_')

trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py

@@ -5373 +5373 @@
         self.assert_lint('void webkit_web_view_load(int var1, int var2)', '', 'Source/Webkit/gtk/webkit/foo.cpp')
         self.assert_lint('void webkit_web_view_load(int var1, int var2)', '', 'Source/Webkit2/UIProcess/gtk/foo.cpp')
+        self.assert_lint('void my_function(int variable_1)',
+                         ['my_function' + name_underscore_error_message,
+                          'variable_1' + name_underscore_error_message],
+                         'Source/Webkit2/UIProcess/gtk/foo.cpp')
 
         # Test that this doesn't also apply to files not in a 'gtk' directory.