mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Auto merge of #11472 - jdm:wip, r=mbrubeck
Report blank lines that follow an open brace This automates something that I find myself frequently commenting on in PRs. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] There are tests for these changes OR <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11472) <!-- Reviewable:end -->
This commit is contained in:
commit
3ec20d9cf5
71 changed files with 11 additions and 164 deletions
|
@ -299,6 +299,7 @@ def check_rust(file_name, lines):
|
|||
whitespace = False
|
||||
|
||||
prev_use = None
|
||||
prev_open_brace = False
|
||||
current_indent = 0
|
||||
prev_crate = {}
|
||||
prev_mod = {}
|
||||
|
@ -342,10 +343,10 @@ def check_rust(file_name, lines):
|
|||
line = re.sub(r"'(\\.|[^\\'])*?'", "''", line)
|
||||
|
||||
# get rid of comments
|
||||
line = re.sub('//.*?$|/\*.*?$|^\*.*?$', '', line)
|
||||
line = re.sub('//.*?$|/\*.*?$|^\*.*?$', '//', line)
|
||||
|
||||
# get rid of attributes that do not contain =
|
||||
line = re.sub('^#[A-Za-z0-9\(\)\[\]_]*?$', '', line)
|
||||
line = re.sub('^#[A-Za-z0-9\(\)\[\]_]*?$', '#[]', line)
|
||||
|
||||
# flag this line if it matches one of the following regular expressions
|
||||
# tuple format: (pattern, format_message, filter_function(match, line))
|
||||
|
@ -401,6 +402,10 @@ def check_rust(file_name, lines):
|
|||
|
||||
yield (idx + 1, message.format(*match.groups(), **match.groupdict()))
|
||||
|
||||
if prev_open_brace and not line:
|
||||
yield (idx + 1, "found an empty line following a {")
|
||||
prev_open_brace = line.endswith("{")
|
||||
|
||||
# check alphabetical order of extern crates
|
||||
if line.startswith("extern crate "):
|
||||
# strip "extern crate " from the begin and ";" from the end
|
||||
|
|
|
@ -58,6 +58,7 @@ class CheckTidiness(unittest.TestCase):
|
|||
self.assertTrue('mod declaration is not in alphabetical order' in errors.next()[2])
|
||||
self.assertEqual('mod declaration spans multiple lines', errors.next()[2])
|
||||
self.assertTrue('extern crate declaration is not in alphabetical order' in errors.next()[2])
|
||||
self.assertEqual('found an empty line following a {', errors.next()[2])
|
||||
self.assertEqual('missing space before ->', errors.next()[2])
|
||||
self.assertEqual('missing space after ->', errors.next()[2])
|
||||
self.assertEqual('missing space after :', errors.next()[2])
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue