Fix VS Code sync script on Windows

We need to resolve the file:// url on windows to import it.
else we get error like:

On Windows, absolute paths must be valid file:// URLs.
Received protocol 'c:'

Also fixes generated file ending to have better interop.

Bug: none
Change-Id: If127b319e6bb36782c136c2d19be767e8d3cdfc7
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6953788
Commit-Queue: Nikolay Vitkov <[email protected]>
Reviewed-by: Alex Rudenko <[email protected]>

Author: Lightning00Blade

package.json

@@ -23,8 +23,8 @@
     "collect-strings": "vpython3 third_party/node/node.py --output third_party/i18n/collect-strings.js front_end",
     "components-server": "vpython3 third_party/node/node.py --output scripts/component_server/server.js",
     "debug-webtest": "vpython3 third_party/node/node.py --output scripts/npm_test.js --debug-devtools",
-    "generate-protocol-resources": "scripts/deps/generate_protocol_resources.py && git cl format --js",
-    "install-deps": "scripts/deps/manage_node_deps.py",
+    "generate-protocol-resources": "vpython3 scripts/deps/generate_protocol_resources.py && git cl format --js",
+    "install-deps": "vpython3 scripts/deps/manage_node_deps.py",
     "lint": "vpython3 third_party/node/node.py --output --experimental-strip-types --no-warnings=ExperimentalWarning scripts/test/run_lint_check.mjs",
     "prebuild": "gn gen out/Default",
     "rdb": "rdb stream -new -realm chromium:public --",

scripts/build/code_generator_frontend.py

@@ -39,8 +39,10 @@
     import simplejson as json
 
 ROOT_DIRECTORY = path.join(path.dirname(__file__), '..', '..')
-GENERATED_LOCATION = path.join(ROOT_DIRECTORY, 'front_end', 'generated', 'InspectorBackendCommands.js')
-READ_LOCATION = path.join(ROOT_DIRECTORY, 'third_party', 'blink', 'public', 'devtools_protocol', 'browser_protocol.json')
+GENERATED_LOCATION = path.join(ROOT_DIRECTORY, 'front_end', 'generated',
+                               'InspectorBackendCommands.js')
+READ_LOCATION = path.join(ROOT_DIRECTORY, 'third_party', 'blink', 'public',
+                          'devtools_protocol', 'browser_protocol.json')
 
 
 def fix_camel_case(name):
@@ -227,7 +229,8 @@ def go():
             if domain_name_lower == "console":
                 continue
 
-            Generator.backend_js_domain_initializer_list.append("// %s.\n" % domain_name)
+            Generator.backend_js_domain_initializer_list.append("// %s.\n" %
+                                                                domain_name)
 
             if "types" in json_domain:
                 for json_type in json_domain["types"]:
@@ -238,8 +241,11 @@ def go():
                         if "properties" in json_type:
                             for json_property in json_type["properties"]:
                                 if "type" in json_property and json_property["type"] == "string" and "enum" in json_property:
-                                    enum_name = "%s.%s%s" % (domain_name, json_type["id"], to_title_case(json_property["name"]))
-                                    Generator.process_enum(json_property, enum_name)
+                                    enum_name = "%s.%s%s" % (
+                                        domain_name, json_type["id"],
+                                        to_title_case(json_property["name"]))
+                                    Generator.process_enum(
+                                        json_property, enum_name)
 
             if "events" in json_domain:
                 for json_event in json_domain["events"]:
@@ -281,7 +287,8 @@ def go():
     def process_enum(json_enum, enum_name):
         enum_members = []
         for member in json_enum["enum"]:
-            enum_members.append("%s: \"%s\"" % (fix_camel_case(member), member))
+            enum_members.append("%s: \"%s\"" %
+                                (fix_camel_case(member), member))
 
         Generator.backend_js_domain_initializer_list.append(
             "inspectorBackend.registerEnum(\"%s\", {%s});\n" % (enum_name, ", ".join(enum_members)))
@@ -404,7 +411,7 @@ def process_command(json_command, domain_name):
 
 Generator.go()
 
-backend_js_file = open(GENERATED_LOCATION, "w+")
+backend_js_file = open(GENERATED_LOCATION, "w+", newline='\n')
 
 backend_js_file.write(
     Templates.backend_js.substitute(None, domainInitializers="".join(Generator.backend_js_domain_initializer_list)))

scripts/build/generate_aria.py

@@ -10,14 +10,18 @@
 import sys
 from os import path
 
-PYJSON5_DIR = os.path.join(os.path.dirname(__file__), '..', '..', 'third_party', 'pyjson5', 'src')
+PYJSON5_DIR = os.path.join(os.path.dirname(__file__), '..', '..',
+                           'third_party', 'pyjson5', 'src')
 sys.path.append(PYJSON5_DIR)
 
 import json5  # pylint: disable=import-error
 
 ROOT_DIRECTORY = path.join(path.dirname(__file__), '..', '..')
-GENERATED_LOCATION = path.join(ROOT_DIRECTORY, 'front_end', 'generated', 'ARIAProperties.js')
-READ_LOCATION = path.join(ROOT_DIRECTORY, 'third_party', 'blink', 'renderer', 'core', 'html', 'aria_properties.json5')
+GENERATED_LOCATION = path.join(ROOT_DIRECTORY, 'front_end', 'generated',
+                               'ARIAProperties.js')
+READ_LOCATION = path.join(ROOT_DIRECTORY, 'third_party', 'blink', 'renderer',
+                          'core', 'html', 'aria_properties.json5')
+
 
 def properties_from_file(file_name):
     with open(os.path.abspath(file_name)) as json5_file:
@@ -27,9 +31,11 @@ def properties_from_file(file_name):
 
 ARIA_PROPERTIES = properties_from_file(READ_LOCATION)
 now = datetime.datetime.now()
-with open(GENERATED_LOCATION, "w+") as f:
+with open(GENERATED_LOCATION, "w+", newline='\n') as f:
     f.write('// Copyright %d The Chromium Authors\n' % now.year)
-    f.write('// Use of this source code is governed by a BSD-style license that can be\n')
+    f.write(
+        '// Use of this source code is governed by a BSD-style license that can be\n'
+    )
     f.write('// found in the LICENSE file.\n')
     f.write('\n')
     f.write("export const config = %s;\n" %

scripts/build/generate_supported_css.py

@@ -93,7 +93,7 @@ def properties_from_file(file_name):
 
 properties, property_values, aliases_for = properties_from_file(READ_LOCATION)
 now = datetime.datetime.now()
-with open(GENERATED_LOCATION, "w+") as f:
+with open(GENERATED_LOCATION, "w+", newline='\n') as f:
     f.write('// Copyright %d The Chromium Authors\n' % now.year)
     f.write(
         '// Use of this source code is governed by a BSD-style license that can be\n'

scripts/deps/sync-vscode-settings.mjs

@@ -5,6 +5,7 @@
 import childProcess from 'child_process';
 import fs from 'fs';
 import path from 'path';
+import url from 'url';
 
 // JSON files under .vscode/ synced by this script
 const VSCODE_SETTINGS_TO_MERGE = [
@@ -23,15 +24,11 @@ if (Boolean(process.env['SKIP_VSCODE_SETTINGS_SYNC'])) {
 }
 
 for (const { settingsFile, mergeField, byField } of VSCODE_SETTINGS_TO_MERGE) {
-  const vscodeSettingsLocation = path.join(
-    process.cwd(),
-    '.vscode',
-    settingsFile,
+  const vscodeSettingsLocation = path.resolve(
+    path.join(process.cwd(), '.vscode', settingsFile),
   );
-  const devtoolsSettingsLocation = path.join(
-    process.cwd(),
-    '.vscode',
-    'devtools-workspace-' + settingsFile,
+  const devtoolsSettingsLocation = path.resolve(
+    path.join(process.cwd(), '.vscode', 'devtools-workspace-' + settingsFile),
   );
 
   // If there are no settings to copy and paste, skip.
@@ -41,14 +38,14 @@ for (const { settingsFile, mergeField, byField } of VSCODE_SETTINGS_TO_MERGE) {
 
   try {
     const devtoolsSettings = (
-      await import(devtoolsSettingsLocation, {
+      await import(url.pathToFileURL(devtoolsSettingsLocation).href, {
         with: { type: 'json' },
       })
     ).default;
     let preExistingSettings = {};
     if (fs.existsSync(vscodeSettingsLocation)) {
       preExistingSettings = (
-        await import(vscodeSettingsLocation, {
+        await import(url.pathToFileURL(vscodeSettingsLocation).href, {
           with: { type: 'json' },
         })
       ).default;