DevTools: [ClosureCompiler] Fix injected script errors on a newer compiler

Source/devtools/scripts/compile_frontend.py

 #!/usr/bin/env python
 # Copyright (c) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 74 matching lines @@
     "source_frame/SourceFrame.js",
 ]
 
 type_checked_jsdoc_tags_list = ["param", "return", "type", "enum"]
 
 type_checked_jsdoc_tags_or = "|".join(type_checked_jsdoc_tags_list)
 
 # Basic regex for invalid JsDoc types: an object type name ([A-Z][A-Za-z0-9.]+[A-Za-z0-9]) not preceded by '!', '?', ':' (this, new), or '.' (object property).
 invalid_type_regex = re.compile(r"@(?:" + type_checked_jsdoc_tags_or + r")\s*\{.*(?<![!?:.A-Za-z0-9])([A-Z][A-Za-z0-9.]+[A-Za-z0-9])[^/]*\}")
 
-invalid_type_designator_regex = re.compile(r"@(?:" + type_checked_jsdoc_tags_or + r")\s*.*([?!])=?\}")
+invalid_type_designator_regex = re.compile(r"@(?:" + type_checked_jsdoc_tags_or + r")\s*.*(?<![{: ])([?!])=?\}")

[aandrey, 2014/06/17 11:38:34]

hard to review

 
 importscript_regex = re.compile(r"importScript\(\s*[\"']")
 error_warning_regex = re.compile(r"(?:WARNING|ERROR)")
 
 errors_found = False
 
 
 def hasErrors(output):
     return re.search(error_warning_regex, output) != None
 
@@ skipping 76 matching lines @@
 print "Verifying 'importScript' function usage..."
 errors_found |= verify_importScript_usage()
 
 print "Verifying JSDoc comments..."
 errors_found |= verify_jsdoc()
 jsdocValidatorProc = verify_jsdoc_extra()
 
 modules_dir = tempfile.mkdtemp()
 common_closure_args = " --summary_detail_level 3 --compilation_level SIMPLE_OPTIMIZATIONS --warning_level VERBOSE --language_in ECMASCRIPT5 --accept_const_keyword --module_output_path_prefix %s/" % modules_dir
 
-compiler_args_file = tempfile.NamedTemporaryFile(mode='wt', delete=False)
-closure_runner_command = "%s -jar %s --compiler-args-file %s" % (java_exec, closure_runner_jar, compiler_args_file.name)
-
 spawned_compiler_command = "%s -jar %s %s \\\n" % (java_exec, closure_compiler_jar, common_closure_args)
 
 modules_by_name = {}
 standalone_modules_by_name = {}
 dependents_by_module_name = {}
 
 for module in modules:
     name = module["name"]
     modules_by_name[name] = module
     if "standalone" in module:
@@ skipping 55 matching lines @@
         else:
             command += ","
         firstDependency = False
         command += jsmodule_name_prefix + dependency
     for script in module["sources"]:
         command += " --js " + path.join(devtools_frontend_path, script)
     return command
 
 print "Compiling frontend..."
 
+compiler_args_file = tempfile.NamedTemporaryFile(mode='wt', delete=False)
+closure_runner_command = "%s -jar %s --compiler-args-file %s" % (java_exec, closure_runner_jar, compiler_args_file.name)
+
 for module in modules:
     closure_args = common_closure_args
     closure_args += " --externs " + global_externs_file
     closure_args += " --externs " + protocol_externs_file
     closure_args += dump_module(module["name"], True, {})
     compiler_args_file.write("%s %s\n" % (module["name"], closure_args))
 
 compiler_args_file.close()
 modular_compiler_proc = subprocess.Popen(closure_runner_command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
 
-def unclosure_injected_script(sourceFileName, outFileName):
-    sourceFile = open(sourceFileName, "r")
-    source = sourceFile.read()
-    sourceFile.close()
+def unclosure_injected_script(sourceFileName, outFileName, has_object_override=False):
+    with open(sourceFileName, "r") as sourceFile:
+        source = sourceFile.read()
 
     def replace_function(matchobj):
         return re.sub(r"@param", "param", matchobj.group(1) or "") + "\n//" + matchobj.group(2)
 
     # Comment out the closure function and its jsdocs
     source = re.sub(r"(/\*\*(?:[\s\n]*\*\s*@param[^\n]+\n)+\s*\*/\s*)?\n(\(function)", replace_function, source, count=1)
 
     # Comment out its return statement
     source = re.sub(r"\n(\s*return\s+[^;]+;\s*\n\}\)\s*)$", "\n/*\\1*/", source)
 
-    outFileName = open(outFileName, "w")
-    outFileName.write(source)
-    outFileName.close()
+    # Replace the "var Object" override with a "self.Object" one
+    if has_object_override:

[aandrey, 2014/06/17 11:38:33]

just remove the flag?

[apavlov, 2014/06/17 11:54:04]

Done.

+        source = re.sub(r"\nvar Object =", "\nself.Object =", source, count=1)
+
+    with open(outFileName, "w") as outFileName:
+        outFileName.write(source)
 
 injectedScriptSourceTmpFile = path.join(inspector_path, "InjectedScriptSourceTmp.js")
 injectedScriptCanvasModuleSourceTmpFile = path.join(inspector_path, "InjectedScriptCanvasModuleSourceTmp.js")
 
-unclosure_injected_script(injected_script_source_name, injectedScriptSourceTmpFile)
+unclosure_injected_script(injected_script_source_name, injectedScriptSourceTmpFile, True)
 unclosure_injected_script(canvas_injected_script_source_name, injectedScriptCanvasModuleSourceTmpFile)
 
 print "Compiling InjectedScriptSource.js and InjectedScriptCanvasModuleSource.js..."
 command = spawned_compiler_command
 command += "    --externs " + path.join(inspector_path, "InjectedScriptExterns.js") + " \\\n"
 command += "    --externs " + protocol_externs_file + " \\\n"
 command += "    --module " + jsmodule_name_prefix + "injected_script" + ":1" + " \\\n"
 command += "        --js " + injectedScriptSourceTmpFile + " \\\n"
 command += "    --module " + jsmodule_name_prefix + "injected_canvas_script" + ":1:" + jsmodule_name_prefix + "injected_script" + " \\\n"
 command += "        --js " + injectedScriptCanvasModuleSourceTmpFile + " \\\n"
@@ skipping 80 matching lines @@
 errors_found |= hasErrors(validateInjectedScriptOut)
 
 if errors_found:
     print "ERRORS DETECTED"
 
 os.remove(injectedScriptSourceTmpFile)
 os.remove(injectedScriptCanvasModuleSourceTmpFile)
 os.remove(compiler_args_file.name)
 os.remove(protocol_externs_file)
 shutil.rmtree(modules_dir, True)