aboutsummaryrefslogtreecommitdiffstats
path: root/python/tidy/servo_tidy/tidy.py
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2016-05-27 11:48:28 -0400
committerJosh Matthews <josh@joshmatthews.net>2016-05-27 13:30:51 -0400
commit4ebc065cba15184c8f63a28f128ec833fffccef7 (patch)
treeab0488d3adf6f9bec1d2a20f5c52d9abd4bf63c9 /python/tidy/servo_tidy/tidy.py
parent3ab5c075595f6bffe3062e26d91f4837fedbf19c (diff)
downloadservo-4ebc065cba15184c8f63a28f128ec833fffccef7.tar.gz
servo-4ebc065cba15184c8f63a28f128ec833fffccef7.zip
Warn about empty lines following an open brace.
Diffstat (limited to 'python/tidy/servo_tidy/tidy.py')
-rw-r--r--python/tidy/servo_tidy/tidy.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index fa080890eb9..8bdce255b38 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -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