From 1360b5bb49fa460f7ccaf1ba37fa56999b0b95b1 Mon Sep 17 00:00:00 2001
From: Monica Kozbial <6621618+moniika@users.noreply.github.com>
Date: Fri, 23 Jul 2021 18:10:38 -0700
Subject: [PATCH] Apply fixes for convert-file script (#5206)

---
 scripts/goog_module/convert-file.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index f3138e9cf..6a8d36cd0 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -190,20 +190,27 @@ step3() {
       local comma_properties=$(echo "${properties_accessed}" | perl -pe 's/\s+/, /g' | perl -pe 's/, $//')
       inf "Detected references of ${require}: ${comma_properties}"
 
-      for require_prop in echo "${properties_accessed}"; do
+      for require_prop in $(echo "${properties_accessed}"); do
         inf "Updating references of ${require}.${require_prop} to ${require_name}.${require_prop}..."
-        perl -pi -e 's/'"${require}"'\.'"${require_prop}"'([^'\''\w])/'"${require_name}"'\.'"${require_prop}"'\1/g' "${filepath}"
+        perl -pi -e 's/'"${require}"'\.'"${require_prop}"'(?!\w)/'"${require_name}"'\.'"${require_prop}"'/g' "${filepath}"
       done
     fi
 
     inf "Updating direct references of ${require} to ${require_name}..."
-    perl -pi -e 's/'"${require}"'([^'\''\w]\.)/'"${require_name}"'\1/g' "${filepath}"
+    perl -pi -e 's/'"${require}"'(?!['\''\w\.])/'"${require_name}"'/g' "${filepath}"
   done
 
   local missing_requires=$(perl -nle'print $& while m{(?<!'\'')Blockly(\.\w+)+}g' "${filepath}")
   missing_requires=$(echo "${missing_requires}" | tr ' ' '\n' | sort -u)
   if [[ -n "${missing_requires}" ]]; then
-    err "Missing requires for:\n${missing_requires}\nPlease manually fix."
+    # Search for the string goog.require('Blockly') or goog.requireType('Blockly')
+    local has_blockly_require=$(perl -ne'print m{goog\.(require|requireType)\('\''Blockly'\''\)}g' "${filepath}")
+    if [[ -n "${has_blockly_require}" ]]; then
+      warn 'Blockly detected as a require.'
+      warn "Potentially missing requires for:\n${missing_requires}\nPlease manually review."
+    else
+      err "Missing requires for:\n${missing_requires}\nPlease manually fix."
+    fi
   fi
 
   success "Completed automation for step 3. Please manually review and reorder requires."