From 54e1bfd74dc516e4800cae34fda165d762e185fc Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Sat, 6 Jan 2024 16:53:27 -0500 Subject: [PATCH] Fixes an oversight with grep checking for conditional spaces (#23658) * bam * okay, not this one --- tools/ci/check_grep2.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/ci/check_grep2.py b/tools/ci/check_grep2.py index 9ebbf17a633..fbf68189889 100644 --- a/tools/ci/check_grep2.py +++ b/tools/ci/check_grep2.py @@ -101,10 +101,9 @@ def check_to_chats_have_a_user_arguement(lines): if TO_CHAT_WITH_NO_USER_ARG_RE.search(line): return Failure(idx + 1, "Changed files contains a to_chat() procedure without a user argument.") -CONDITIONAL_LEADING_SPACE = re.compile(r"(if|for|while|switch)\s+(\(.*?\))") # checks for "if (thing)", replace with $1$2 -CONDITIONAL_BEGINNING_SPACE = re.compile(r"(if|for|while|switch)(\(.+) \)") # checks for "if( thing)", replace with $1$2) -CONDITIONAL_ENDING_SPACE = re.compile(r"(if|for|while|switch)\( (.+\))") # checks for "if(thing )", replace with $1($2 -CONDITIONAL_INFIX_NOT_SPACE = re.compile(r"(if)\(! (.+\))") # checks for "if(! thing)", replace with $1(!$2 +CONDITIONAL_LEADING_SPACE = re.compile(r"(if|for|while|switch)\s+(\(.*?\)?)") # checks for "if (thing)", replace with $1$2 +CONDITIONAL_BEGINNING_SPACE = re.compile(r"(if|for|while|switch)\((!?) (.+\)?)") # checks for "if( thing)", replace with $1($2$3 +CONDITIONAL_ENDING_SPACE = re.compile(r"(if|for|while|switch)(\(.+) \)") # checks for "if(thing )", replace with $1$2) # To fix any of these, run them as regex in VSCode, with the appropriate replacement # It may be a good idea to turn the replacement into a script someday def check_conditional_spacing(lines): @@ -115,8 +114,6 @@ def check_conditional_spacing(lines): return Failure(idx + 1, "Found a conditional statement matching the format \"if( thing)\", please use \"if(thing)\" instead.") if CONDITIONAL_ENDING_SPACE.search(line): return Failure(idx + 1, "Found a conditional statement matching the format \"if(thing )\", please use \"if(thing)\" instead.") - if CONDITIONAL_INFIX_NOT_SPACE.search(line): - return Failure(idx + 1, "Found a conditional statement matching the format \"if(! thing)\", please use \"if(!thing)\" instead.") # makes sure that no global list inits have an empty list in them without using the helper GLOBAL_LIST_EMPTY = re.compile(r"(?