From 08fdf04698c1969278bc007abea6c0e33371bd9d Mon Sep 17 00:00:00 2001
From: Mandy Chen <mandy.chen@microsoft.com>
Date: Mon, 23 Sep 2019 19:57:20 +0000
Subject: [PATCH] DevTools: Clean up localization parsing scripts

This CL:

* updates parseLocalizableResourceMaps to return maps of localizable
resources
* removes localizable resources from exports
* fixes non-async functions
* fixes existing parsing error

This CL is in preparation of https://crrev.com/c/1671848.

Bug: 941561
Change-Id: Id18faf3086fb8d9d3c75b110733784ba95cf56e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1814539
Commit-Queue: Mandy Chen <mandy.chen@microsoft.com>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#699005}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c108074d7327d594c73b0f6dc578da42632ba404
---
 scripts/check_localizable_resources.js                |  9 +++++----
 scripts/localization_utils/check_localized_strings.js | 10 +++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/scripts/check_localizable_resources.js b/scripts/check_localizable_resources.js
index 50e1019098..21e3736613 100644
--- a/scripts/check_localizable_resources.js
+++ b/scripts/check_localizable_resources.js
@@ -33,7 +33,7 @@ async function main() {
     if (shouldAutoFix)
       await autofix(error);
     else
-      await getErrors(error);
+      getErrors();
   } catch (e) {
     console.log(e.stack);
     console.log(`Error: ${e.message}`);
@@ -43,11 +43,12 @@ async function main() {
 
 main();
 
-async function getErrors(existingError) {
-  const toAddError = await checkLocalizedStrings.getAndReportResourcesToAdd();
+function getErrors(existingError) {
+  const toAddError = checkLocalizedStrings.getAndReportResourcesToAdd();
   const toModifyError = checkLocalizedStrings.getAndReportIDSKeysToModify();
   const toRemoveError = checkLocalizedStrings.getAndReportResourcesToRemove();
-  let error = `${existingError}\n${toAddError || ''}${toModifyError || ''}${toRemoveError || ''}`;
+  let error =
+      `${existingError ? `${existingError}\n` : ''}${toAddError || ''}${toModifyError || ''}${toRemoveError || ''}`;
 
   if (error === '') {
     console.log('DevTools localizable resources checker passed.');
diff --git a/scripts/localization_utils/check_localized_strings.js b/scripts/localization_utils/check_localized_strings.js
index ab4d65a4bd..90dd6b6af5 100644
--- a/scripts/localization_utils/check_localized_strings.js
+++ b/scripts/localization_utils/check_localized_strings.js
@@ -188,6 +188,12 @@ function validateGrdpFile(dir, grdpFiles, grdFileContent, shouldAutoFix, renameF
  * Parse localizable resources.
  */
 async function parseLocalizableResourceMaps() {
+  if (frontendStrings.size === 0 && IDSkeys.size === 0)
+    await parseLocalizableResourceMapsHelper();
+  return [frontendStrings, IDSkeys];
+}
+
+async function parseLocalizableResourceMapsHelper() {
   const grdpToFiles = new Map();
   const dirs = devtoolsFrontendDirs || await localizationUtils.getChildDirectoriesFromDirectory(devtoolsFrontendPath);
   const grdpToFilesPromises = dirs.map(dir => {
@@ -485,7 +491,7 @@ function addMessage(expectedIDSKey, actualIDSKey, grdpPath, line, description) {
  * with grdp <message>s and report error of resources to add,
  * remove or modify.
  */
-async function getAndReportResourcesToAdd() {
+function getAndReportResourcesToAdd() {
   const keysToAddToGRD = getMessagesToAdd();
   if (keysToAddToGRD.size === 0)
     return;
@@ -625,8 +631,6 @@ function getLongestDescription(messages) {
 }
 
 module.exports = {
-  frontendStrings,
-  IDSkeys,
   parseLocalizableResourceMaps,
   getAndReportIDSKeysToModify,
   getAndReportResourcesToAdd,