[DevTools] Fix compile_frontend.py script

third_party/WebKit/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 58 matching lines @@
     return output.strip().replace('\\', '\\\\')
 
 scripts_path = path.dirname(path.abspath(__file__))
 devtools_path = path.dirname(scripts_path)
 inspector_path = path.join(path.dirname(devtools_path), 'core', 'inspector')
 # TODO(dgozman): move these checks to v8.
 v8_inspector_path = path.normpath(path.join(path.dirname(devtools_path), os.pardir, os.pardir, os.pardir, 'v8', 'src', 'inspector'))
 devtools_frontend_path = path.join(devtools_path, 'front_end')
 global_externs_file = to_platform_path(path.join(devtools_frontend_path, 'externs.js'))
 protocol_externs_file = path.join(devtools_frontend_path, 'protocol_externs.js')
-injected_script_source_name = path.join(v8_inspector_path, 'injected-script-source.js')
-injected_script_externs_file = path.join(v8_inspector_path, 'injected_script_externs.js')
-debugger_script_source_name = path.join(v8_inspector_path, 'debugger-script.js')
-debugger_script_externs_file = path.join(v8_inspector_path, 'debugger_script_externs.js')
 
 jsmodule_name_prefix = 'jsmodule_'
 runtime_module_name = '_runtime'
 
 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*.*(?<![{: ])([?!])=?\}')
@@ skipping 36 matching lines @@
 application_descriptors = ['inspector.json', 'toolbox.json', 'formatter_worker.json', 'heap_snapshot_worker.json', 'temp_storage_shared_worker.json']
 loader = modular_build.DescriptorLoader(devtools_frontend_path)
 descriptors = loader.load_applications(application_descriptors)
 modules_by_name = descriptors.modules
 
 
 def hasErrors(output):
     return re.search(error_warning_regex, output) != None
 
 
-def verify_jsdoc_extra(additional_files):
-    files = [to_platform_path(file) for file in descriptors.all_compiled_files() + additional_files]
+def verify_jsdoc_extra():
+    files = [to_platform_path(compiled_file) for compiled_file in descriptors.all_compiled_files()]
     file_list = tempfile.NamedTemporaryFile(mode='wt', delete=False)
     try:
         file_list.write('\n'.join(files))
     finally:
         file_list.close()
     return popen(java_exec + ['-jar', jsdoc_validator_jar, '--files-list-name', to_platform_path_exact(file_list.name)]), file_list
 
 
-def verify_jsdoc(additional_files):
+def verify_jsdoc():
     def file_list():
-        return descriptors.all_compiled_files() + additional_files
+        return descriptors.all_compiled_files()
 
     errors_found = False
     for full_file_name in file_list():
         lineIndex = 0
         with open(full_file_name, 'r') as sourceFile:
             for line in sourceFile:
                 line = line.rstrip()
                 lineIndex += 1
                 if not line:
                     continue
@@ skipping 198 matching lines @@
         closure_args += ' --externs ' + to_platform_path(global_externs_file)
         closure_args += ' --externs ' + platform_protocol_externs_file
         runtime_module = module_arg(runtime_module_name) + ':1 --js ' + runtime_js_path
         closure_args += runtime_module + dump_module(name, True, {})
         compiler_args_file.write('%s %s%s' % (name, closure_args, os.linesep))
 finally:
     compiler_args_file.close()
 
 modular_compiler_proc = popen(java_exec + ['-jar', closure_runner_jar, '--compiler-args-file', to_platform_path_exact(compiler_args_file.name)])
 
-def unclosure_injected_script(sourceFileName, outFileName):
-
-    source = read_file(sourceFileName)
-
-    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)
-
-    # Replace the "var Object" override with a "self.Object" one
-    source = re.sub(r'\nvar Object =', '\nself.Object =', source, count=1)
-
-    write_file(outFileName, source)
-
-injectedScriptSourceTmpFile = to_platform_path(path.join(inspector_path, 'InjectedScriptSourceTmp.js'))
-
-unclosure_injected_script(injected_script_source_name, injectedScriptSourceTmpFile)
-
-print 'Compiling InjectedScriptSource.js...'
-
 spawned_compiler_command = java_exec + [
     '-jar',
     closure_compiler_jar
 ] + common_closure_args
 
-command = spawned_compiler_command + [
-    '--externs', to_platform_path_exact(injected_script_externs_file),
-    '--externs', to_platform_path_exact(protocol_externs_file),
-    '--module', jsmodule_name_prefix + 'injected_script' + ':1',
-    '--js', to_platform_path(injectedScriptSourceTmpFile)
-]
-
-injectedScriptCompileProc = popen(command)
-
-print 'Compiling DebuggerScript.js...'
-
-command = spawned_compiler_command + [
-    '--externs', to_platform_path_exact(debugger_script_externs_file),
-    '--module', jsmodule_name_prefix + 'debugger_script' + ':1',
-    '--js', to_platform_path(debugger_script_source_name)
-]
-
-debuggerScriptCompileProc = popen(command)
-
 print 'Compiling devtools.js...'
 
 command = spawned_compiler_command + [
     '--externs', to_platform_path(global_externs_file),
     '--externs', to_platform_path(path.join(devtools_frontend_path, 'host', 'InspectorFrontendHostAPI.js')),
     '--jscomp_off=externsValidation',
     '--module', jsmodule_name_prefix + 'devtools_js' + ':1',
     '--js', to_platform_path(path.join(devtools_frontend_path, 'devtools.js'))
 ]
 devtoolsJSCompileProc = popen(command)
 
 print 'Verifying JSDoc comments...'
-additional_jsdoc_check_files = [injectedScriptSourceTmpFile]
-errors_found |= verify_jsdoc(additional_jsdoc_check_files)
-jsdocValidatorProc, jsdocValidatorFileList = verify_jsdoc_extra(additional_jsdoc_check_files)
-
-print 'Validating InjectedScriptSource.js...'
-injectedscript_check_script_path = path.join(scripts_path, "check_injected_script_source.py")
-validateInjectedScriptProc = popen([sys.executable, injectedscript_check_script_path, injected_script_source_name])
+errors_found |= verify_jsdoc()
+(jsdocValidatorProc, jsdocValidatorFileList) = verify_jsdoc_extra()
 
 print
 
 (jsdocValidatorOut, _) = jsdocValidatorProc.communicate()
 if jsdocValidatorOut:
     print ('JSDoc validator output:%s%s' % (os.linesep, jsdocValidatorOut))
     errors_found = True
 
 os.remove(jsdocValidatorFileList.name)
 
@@ skipping 47 matching lines @@
             print 'Module %s compile failed: %s errors%s' % (module_name, module_error_count, os.linesep)
             print os.linesep.join(module_output)
 
 if not has_module_output:
     print moduleCompileOut
 
 if error_count:
     print 'Total Closure errors: %d%s' % (error_count, os.linesep)
     errors_found = True
 
-(injectedScriptCompileOut, _) = injectedScriptCompileProc.communicate()
-print 'InjectedScriptSource.js compilation output:%s' % os.linesep, injectedScriptCompileOut
-errors_found |= hasErrors(injectedScriptCompileOut)
-
-(debuggerScriptCompilerOut, _) = debuggerScriptCompileProc.communicate()
-print 'DebuggerScript.js compilation output:%s' % os.linesep, debuggerScriptCompilerOut
-errors_found |= hasErrors(debuggerScriptCompilerOut)
-
 (devtoolsJSCompileOut, _) = devtoolsJSCompileProc.communicate()
 print 'devtools.js compilation output:%s' % os.linesep, devtoolsJSCompileOut
 errors_found |= hasErrors(devtoolsJSCompileOut)
 
-(validateInjectedScriptOut, _) = validateInjectedScriptProc.communicate()
-print 'Validate InjectedScriptSource.js output:%s' % os.linesep, (validateInjectedScriptOut if validateInjectedScriptOut else '<empty>')
-errors_found |= hasErrors(validateInjectedScriptOut)
-
 if errors_found:
     print 'ERRORS DETECTED'
 
-os.remove(injectedScriptSourceTmpFile)
 os.remove(compiler_args_file.name)
 os.remove(protocol_externs_file)
 shutil.rmtree(modules_dir, True)