浏览代码

js: Display a warning if multiple files are given

Also instead of making a frankenstein path with all the paths combined
just take the first one, this is needed for resolving modules.
davidot 3 年之前
父节点
当前提交
0e56dac51e
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      Userland/Utilities/js.cpp

+ 5 - 3
Userland/Utilities/js.cpp

@@ -1547,6 +1547,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             sigint_handler();
             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;
         StringBuilder builder;
         for (auto& path : script_paths) {
         for (auto& path : script_paths) {
             auto file = TRY(Core::File::open(path, Core::OpenMode::ReadOnly));
             auto file = TRY(Core::File::open(path, Core::OpenMode::ReadOnly));
@@ -1555,10 +1558,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             builder.append(source);
             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;
             return 1;
     }
     }