LibWeb: Provide file name to JavaScript interpreter

lanmonster · Mar 1, 2021 · 8dca96f · 8dca96f
1 parent 6172cb3
commit 8dca96f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp
@@ -546,9 +546,9 @@ JS::Interpreter& Document::interpreter()
  return *m_interpreter;
 }
 
-JS::Value Document::run_javascript(const StringView& source)
+JS::Value Document::run_javascript(const StringView& source, const StringView& filename)
 {
- auto parser = JS::Parser(JS::Lexer(source));
+ auto parser = JS::Parser(JS::Lexer(source, filename));
  auto program = parser.parse_program();
  if (parser.has_errors()) {
  parser.print_errors();

diff --git a/Userland/Libraries/LibWeb/DOM/Document.h b/Userland/Libraries/LibWeb/DOM/Document.h
@@ -157,7 +157,7 @@ class Document
 
  virtual JS::Interpreter& interpreter() override;
 
- JS::Value run_javascript(const StringView&);
+ JS::Value run_javascript(const StringView& source, const StringView& filename = "(unknown)");
 
  NonnullRefPtr<Element> create_element(const String& tag_name);
  NonnullRefPtr<Element> create_element_ns(const String& namespace_, const String& qualifed_name);

diff --git a/Userland/Libraries/LibWeb/HTML/HTMLScriptElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLScriptElement.cpp
@@ -40,6 +40,7 @@ namespace Web::HTML {
 
 HTMLScriptElement::HTMLScriptElement(DOM::Document& document, QualifiedName qualified_name)
  : HTMLElement(document, move(qualified_name))
+ , m_script_filename("(document)")
 {
 }
 
@@ -89,7 +90,7 @@ void HTMLScriptElement::execute_script()
  else
  dbgln_if(HTML_SCRIPT_DEBUG, "HTMLScriptElement: Running inline script");
 
- document().run_javascript(m_script_source);
+ document().run_javascript(m_script_source, m_script_filename);
 
  document().set_current_script({}, old_current_script);
  } else {
@@ -229,6 +230,7 @@ void HTMLScriptElement::prepare_script(Badge<HTMLDocumentParser>)
 
  if (m_script_type == ScriptType::Classic) {
  // FIXME: This load should be made asynchronous and the parser should spin an event loop etc.
+ m_script_filename = url.basename();
  ResourceLoader::the().load_sync(
  url,
  [this, url](auto data, auto&) {

diff --git a/Userland/Libraries/LibWeb/HTML/HTMLScriptElement.h b/Userland/Libraries/LibWeb/HTML/HTMLScriptElement.h
@@ -72,6 +72,7 @@ class HTMLScriptElement final : public HTMLElement {
  Function<void()> m_script_ready_callback;
 
  String m_script_source;
+ String m_script_filename;
 };
 
 }