diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py index f7d7f5f7c..b92b31a8f 100644 --- a/presubmit_canned_checks.py +++ b/presubmit_canned_checks.py @@ -597,25 +597,32 @@ def CheckLongLines(input_api, output_api, maxlen, source_file_filter=None): '': maxlen, } + # To avoid triggering on the magic string, break it up. + LINT_THEN_CHANGE_EXCEPTION = ('LI' + 'NT.ThenChange(') + # Language specific exceptions to max line length. # '.h' is considered an obj-c file extension, since OBJC_EXCEPTIONS are a # superset of CPP_EXCEPTIONS. CPP_FILE_EXTS = ('c', 'cc') CPP_EXCEPTIONS = ('#define', '#endif', '#if', '#include', '#pragma', - '// LINT.ThenChange(') + '// ' + LINT_THEN_CHANGE_EXCEPTION) HTML_FILE_EXTS = ('html', ) - HTML_EXCEPTIONS = ('