RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 03:17:35 +00:00
Code Issues Activity Actions

js: Display a warning if multiple files are given

Browse source 
Also instead of making a frankenstein path with all the paths combined
just take the first one, this is needed for resolving modules.
This commit is contained in:
davidot 2022-01-17 18:47:32 +01:00 • committed by Linus Groh
parent 2d4b345bb1
commit 0e56dac51e
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Utilities/js.cpp
View file

@ -1547,6 +1547,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
sigint_handler();
});
if (script_paths.size() > 1)
warnln("Warning: Multiple files supplied, this will concatenate the sources and resolve modules as if it was the first file");
StringBuilder builder;
for (auto& path : script_paths) {
auto file = TRY(Core::File::open(path, Core::OpenMode::ReadOnly));
@ -1555,10 +1558,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
builder.append(source);
}
StringBuilder source_name_builder;
source_name_builder.join(", ", script_paths);
// We resolve modules as if it is the first file
if (!parse_and_run(*interpreter, builder.string_view(), source_name_builder.string_view()))
if (!parse_and_run(*interpreter, builder.string_view(), script_paths[0]))
return 1;
}