Skip to content
Snippets Groups Projects
Commit 81b63e2a authored by Campbell Barton's avatar Campbell Barton
Browse files

Correct check for whitespace around braces

parent a45c3f0d
No related branches found
No related tags found
No related merge requests found
...@@ -157,6 +157,8 @@ def tk_match_backet(index): ...@@ -157,6 +157,8 @@ def tk_match_backet(index):
index_match = index + direction index_match = index + direction
while True: while True:
item = tokens[index_match] item = tokens[index_match]
# For checking odd braces:
# print(filepath, tokens[index].line, item.line)
if item.type == Token.Punctuation: if item.type == Token.Punctuation:
if item.text == backet_start: if item.text == backet_start:
level += 1 level += 1
...@@ -330,7 +332,7 @@ def blender_check_kw_if(index_kw_start, index_kw, index_kw_end): ...@@ -330,7 +332,7 @@ def blender_check_kw_if(index_kw_start, index_kw, index_kw_end):
# check for: ){ # check for: ){
index_next = tk_advance_ws_newline(index_kw_end, 1) index_next = tk_advance_ws_newline(index_kw_end, 1)
if tokens[index_next].type == Token.Punctuation and tokens[index_next].text == "{": if tokens[index_next].type == Token.Punctuation and tokens[index_next].text == "{":
if not tk_item_is_ws(tokens[index_next - 1]): if not tk_item_is_ws_newline(tokens[index_next - 1]):
warning("no white space between trailing bracket '%s (){'" % tokens[index_kw].text, index_kw_start, index_kw_end) warning("no white space between trailing bracket '%s (){'" % tokens[index_kw].text, index_kw_start, index_kw_end)
# check for: if () # check for: if ()
...@@ -368,7 +370,7 @@ def blender_check_kw_if(index_kw_start, index_kw, index_kw_end): ...@@ -368,7 +370,7 @@ def blender_check_kw_if(index_kw_start, index_kw, index_kw_end):
warning("multi-line should use a on a new line '%s (\\n\\n) {'" % tokens[index_kw].text, index_kw, index_kw_end) warning("multi-line should use a on a new line '%s (\\n\\n) {'" % tokens[index_kw].text, index_kw, index_kw_end)
# Note: this could be split into its own function # Note: this could be split into its own function
# since its not spesific to if-statements, # since its not specific to if-statements,
# can also work for function calls. # can also work for function calls.
# #
# check indentation on a multi-line statement: # check indentation on a multi-line statement:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment