Put git cl format JS formatting behind a flag.

This CL moves JS formatting behind the --js flag for git cl format
due to issue with LayoutTests. It also adds an option to check
javascript for the presubmit canned formatting check.

BUG=567770

Change-Id: I9c080b1136f6ffef9fb1b08d3bfc97ce5b3185dc
Reviewed-on: https://chromium-review.googlesource.com/430526Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Christopher Lam <calamity@chromium.org>

git_cl.py

@@ -5212,7 +5212,7 @@ def MatchingFileType(file_name, extensions):
 @subcommand.usage('[files or directories to diff]')
 def CMDformat(parser, args):
   """Runs auto-formatting tools (clang-format etc.) on the diff."""
-  CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java', '.js']
+  CLANG_EXTS = ['.cc', '.cpp', '.h', '.m', '.mm', '.proto', '.java']
   GN_EXTS = ['.gn', '.gni', '.typemap']
   parser.add_option('--full', action='store_true',
                     help='Reformat the full content of all touched files')
@@ -5220,6 +5220,8 @@ def CMDformat(parser, args):
                     help='Don\'t modify any file on disk.')
   parser.add_option('--python', action='store_true',
                     help='Format python code with yapf (experimental).')
+  parser.add_option('--js', action='store_true',
+                    help='Format javascript code with clang-format.')
   parser.add_option('--diff', action='store_true',
                     help='Print diff to stdout rather than modifying files.')
   opts, args = parser.parse_args(args)
@@ -5255,6 +5257,9 @@ def CMDformat(parser, args):
   # Filter out files deleted by this CL
   diff_files = [x for x in diff_files if os.path.isfile(x)]
 
+  if opts.js:
+    CLANG_EXTS.append('.js')
+
   clang_diff_files = [x for x in diff_files if MatchingFileType(x, CLANG_EXTS)]
   python_diff_files = [x for x in diff_files if MatchingFileType(x, ['.py'])]
   dart_diff_files = [x for x in diff_files if MatchingFileType(x, ['.dart'])]

presubmit_canned_checks.py

@@ -1125,9 +1125,13 @@ def PanProjectChecks(input_api, output_api,
   return results
 
 
-def CheckPatchFormatted(input_api, output_api):
+def CheckPatchFormatted(input_api, output_api, check_js=False):
   import git_cl
-  cmd = ['cl', 'format', '--dry-run', input_api.PresubmitLocalPath()]
+  cmd = ['cl', 'format', '--dry-run']
+  if check_js:
+    cmd.append('--js')
+  cmd.append(input_api.PresubmitLocalPath())
+
   code, _ = git_cl.RunGitWithCode(cmd, suppress_stderr=True)
   if code == 2:
     short_path = input_api.basename(input_api.PresubmitLocalPath())
@@ -1135,8 +1139,8 @@ def CheckPatchFormatted(input_api, output_api):
                                           input_api.change.RepositoryRoot())
     return [output_api.PresubmitPromptWarning(
       'The %s directory requires source formatting. '
-      'Please run git cl format %s' %
-      (short_path, full_path))]
+      'Please run git cl format %s%s' %
+      (short_path, '--js ' if check_js else '', full_path))]
   # As this is just a warning, ignore all other errors if the user
   # happens to have a broken clang-format, doesn't use git, etc etc.
   return []