Make docstrings more consistent using format-webkitpy.

third_party/WebKit/Tools/Scripts/webkitpy/formatter/fix_docstrings.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/formatter/fix_docstrings.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/formatter/fix_docstrings.py b/third_party/WebKit/Tools/Scripts/webkitpy/formatter/fix_docstrings.py
index 246e5315ec0f47b247e09d01ffd6e247e0fa1aa3..d4ad417db9849257f3f6007962508008be88d0d6 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/formatter/fix_docstrings.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/formatter/fix_docstrings.py
@@ -12,6 +12,7 @@ import re
 
 from lib2to3.fixer_base import BaseFix
 from lib2to3.pgen2 import token
+from lib2to3.pygram import python_symbols
 
 
 class FixDocstrings(BaseFix):
@@ -20,7 +21,21 @@ class FixDocstrings(BaseFix):
     _accept_type = token.STRING
 
     def match(self, node):
-        return node.value.startswith('"""') and node.prev_sibling is None
+        """Returns True if the given node appears to be a docstring.
+
+        Docstrings should always have no previous siblings, and should be
+        direct children of simple_stmt.
+
+        Note: This may also match for some edge cases where there are
+        simple_stmt strings that aren't the first thing in a module, class
+        or function, and thus aren't considered docstrings; but changing these
+        strings should not change behavior.
+        """
+        # Pylint incorrectly warns that there's no member simple_stmt on python_symbols
+        # because the attribute is set dynamically.  pylint: disable=no-member
+        return (node.value.startswith('"""') and
+                node.prev_sibling is None and
+                node.parent.type == python_symbols.simple_stmt)

[qyearsley, 2016/09/04 19:42:46]

After running the formatter on the webkitpy codebase, I found a few cases where
the formatter was incorrectly applied, which were all of the form:

    some_function("""
    some string that's not a docstring
    """)

Unfortunately, I couldn't easily add a test for this that would fail with the
previous code (when the match function was not strict enough); it appears that
the way that the code is parsed in the sample inputs in
formatter/main_unittest.py is different than when it's parsing real Python
source code.

After changing the match function to only match when the parent node type is
simple_stmt, then it appears to work correctly for all code in webkitpy.

[Dirk Pranke, 2016/09/06 01:14:27]

Acknowledged.

 
     def transform(self, node, results):
         # First, strip whitespace at the beginning and end.