| Index: third_party/WebKit/Tools/Scripts/webkitpy/style/checker.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/style/checker.py b/third_party/WebKit/Tools/Scripts/webkitpy/style/checker.py
|
| index e7a2dec01ae41395562fffc8c7b7f7bb49f2ad55..060a95a6449efca92cc374963e6c0e81f75cb5db 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/style/checker.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/style/checker.py
|
| @@ -107,7 +107,7 @@ _BASE_FILTER_RULES = [
|
|
|
| # FIXME: Move the pylint rules from the pylintrc to here. This will
|
| # also require us to re-work lint-webkitpy to produce the equivalent output.
|
| - ]
|
| +]
|
|
|
|
|
| # The path-specific filter rules.
|
| @@ -125,8 +125,8 @@ _PATH_RULES_SPECIFIER = [
|
| # API and therefore do not follow the same header including
|
| # discipline as WebCore.
|
|
|
| - ([# There is no clean way to avoid "yy_*" names used by flex.
|
| - "Source/core/css/CSSParser-in.cpp"],
|
| + ([ # There is no clean way to avoid "yy_*" names used by flex.
|
| + "Source/core/css/CSSParser-in.cpp"],
|
| ["-readability/naming"]),
|
|
|
| # For third-party Python code, keep only the following checks--
|
| @@ -141,17 +141,17 @@ _PATH_RULES_SPECIFIER = [
|
| "+pep8/W291", # Trailing white space
|
| "+whitespace/carriage_return"]),
|
|
|
| - ([# Jinja templates: files have .cpp or .h extensions, but contain
|
| - # template code, which can't be handled, so disable tests.
|
| - "Source/bindings/templates",
|
| - "Source/build/scripts/templates"],
|
| + ([ # Jinja templates: files have .cpp or .h extensions, but contain
|
| + # template code, which can't be handled, so disable tests.
|
| + "Source/bindings/templates",
|
| + "Source/build/scripts/templates"],
|
| ["-"]),
|
|
|
| - ([# IDL compiler reference output
|
| - # Conforming to style significantly increases the complexity of the code
|
| - # generator and decreases *its* readability, which is of more concern
|
| - # than style of the machine-generated code itself.
|
| - "Source/bindings/tests/results"],
|
| + ([ # IDL compiler reference output
|
| + # Conforming to style significantly increases the complexity of the code
|
| + # generator and decreases *its* readability, which is of more concern
|
| + # than style of the machine-generated code itself.
|
| + "Source/bindings/tests/results"],
|
| ["-"]),
|
| ]
|
|
|
| @@ -160,7 +160,7 @@ _CPP_FILE_EXTENSIONS = [
|
| 'c',
|
| 'cpp',
|
| 'h',
|
| - ]
|
| +]
|
|
|
| _JSON_FILE_EXTENSION = 'json'
|
|
|
| @@ -185,14 +185,14 @@ _TEXT_FILE_EXTENSIONS = [
|
| 'txt',
|
| 'xhtml',
|
| 'y',
|
| - ]
|
| +]
|
|
|
| _XCODEPROJ_FILE_EXTENSION = 'pbxproj'
|
|
|
| _XML_FILE_EXTENSIONS = [
|
| 'vcproj',
|
| 'vsprops',
|
| - ]
|
| +]
|
|
|
| _PNG_FILE_EXTENSION = 'png'
|
|
|
| @@ -220,14 +220,14 @@ _SKIPPED_FILES_WITHOUT_WARNING = [
|
| "Source/ThirdParty/leveldb" + os.path.sep,
|
| # Prevents this being recognized as a text file.
|
| "Source/WebCore/GNUmakefile.features.am.in",
|
| - ]
|
| +]
|
|
|
| # Extensions of files which are allowed to contain carriage returns.
|
| _CARRIAGE_RETURN_ALLOWED_FILE_EXTENSIONS = [
|
| 'png',
|
| 'vcproj',
|
| 'vsprops',
|
| - ]
|
| +]
|
|
|
| # The maximum number of errors to report per file, per category.
|
| # If a category is not a key, then it has no maximum.
|
| @@ -277,15 +277,15 @@ def check_webkit_style_configuration(options):
|
|
|
| """
|
| filter_configuration = FilterConfiguration(
|
| - base_rules=_BASE_FILTER_RULES,
|
| - path_specific=_PATH_RULES_SPECIFIER,
|
| - user_rules=options.filter_rules)
|
| + base_rules=_BASE_FILTER_RULES,
|
| + path_specific=_PATH_RULES_SPECIFIER,
|
| + user_rules=options.filter_rules)
|
|
|
| return StyleProcessorConfiguration(filter_configuration=filter_configuration,
|
| - max_reports_per_category=_MAX_REPORTS_PER_CATEGORY,
|
| - min_confidence=options.min_confidence,
|
| - output_format=options.output_format,
|
| - stderr_write=sys.stderr.write)
|
| + max_reports_per_category=_MAX_REPORTS_PER_CATEGORY,
|
| + min_confidence=options.min_confidence,
|
| + output_format=options.output_format,
|
| + stderr_write=sys.stderr.write)
|
|
|
|
|
| def _create_log_handlers(stream):
|
| @@ -408,7 +408,7 @@ class CheckerDispatcher(object):
|
| if file_path.find(skip_array_entry) >= 0:
|
| return True
|
| elif skip_array_entry.match(file_path):
|
| - return True
|
| + return True
|
| return False
|
|
|
| def should_skip_with_warning(self, file_path):
|
|
|