refactor(fe): make parse_and_lint accept a Configuration

Simplify parse_and_lint callers by moving the Configuration::globals()
call into parse_and_lint.

This refactor will allow parse_and_lint to use more data from the
Configuration object in the future.

Author: strager

plugin/vscode/quick-lint-js/vscode/qljs-document.h

@@ -160,8 +160,10 @@ class QLJS_Lintable_Document : public QLJS_Document_Base {
     VSCode_Diag_Reporter diag_reporter(vscode, env, &this->document_.locator(),
                                        this->uri());
     parse_and_lint(this->document_.string(), diag_reporter,
-                   this->config_->globals(),
-                   Linter_Options{.language = this->language_});
+                   Linter_Options{
+                       .language = this->language_,
+                       .configuration = this->config_,
+                   });
 
     return std::move(diag_reporter).diagnostics();
   }

src/quick-lint-js/c-api.cpp

@@ -98,8 +98,9 @@ const QLJS_Web_Demo_Diagnostic* qljs_web_demo_lint(QLJS_Web_Demo_Document* p) {
     Configuration().load_from_json(&p->text_, &diags);
     p->diag_reporter_.report(diags);
   } else {
-    parse_and_lint(&p->text_, p->diag_reporter_, p->config_.globals(),
-                   Linter_Options{.language = p->language_});
+    parse_and_lint(
+        &p->text_, p->diag_reporter_,
+        Linter_Options{.language = p->language_, .configuration = &p->config_});
   }
   return p->diag_reporter_.get_diagnostics();
 }

src/quick-lint-js/cli/main.cpp

@@ -301,11 +301,11 @@ void run(Options o) {
       }
       Linter_Options lint_options = {
           .language = get_language(file, o),
+          .configuration = config,
           .print_parser_visits = o.print_parser_visits,
       };
       reporter->set_source(&*source, file);
-      parse_and_lint(&*source, *reporter->get(), config->globals(),
-                     lint_options);
+      parse_and_lint(&*source, *reporter->get(), lint_options);
     }
   }
   reporter->finish();

src/quick-lint-js/fe/linter.cpp

@@ -1,6 +1,7 @@
 // Copyright (C) 2020  Matthew "strager" Glazar
 // See end of file for extended copyright information.
 
+#include <quick-lint-js/configuration/configuration.h>
 #include <quick-lint-js/container/padded-string.h>
 #include <quick-lint-js/debug/debug-probe.h>
 #include <quick-lint-js/fe/debug-parse-visitor.h>
@@ -15,7 +16,6 @@
 
 namespace quick_lint_js {
 void parse_and_lint(Padded_String_View code, Diag_Reporter& reporter,
-                    const Global_Declared_Variable_Set& globals,
                     Linter_Options options) {
   Parser_Options parser_options;
   switch (options.language) {
@@ -44,7 +44,7 @@ void parse_and_lint(Padded_String_View code, Diag_Reporter& reporter,
 
   Parser p(code, &reporter, parser_options);
   Variable_Analyzer var_analyzer(
-      &reporter, &globals,
+      &reporter, &options.configuration->globals(),
       Variable_Analyzer_Options{
           .allow_deleting_typescript_variable = !parser_options.typescript,
           .eval_can_declare_variables = !parser_options.typescript,

src/quick-lint-js/fe/linter.h

@@ -6,20 +6,21 @@
 #include <quick-lint-js/fe/language.h>
 
 namespace quick_lint_js {
+class Configuration;
 class Diag_Reporter;
-class Global_Declared_Variable_Set;
 class Padded_String_View;
 
 // TODO(#465): Accept parser options from quick-lint-js.config or CLI options.
 struct Linter_Options {
   File_Language language;
 
+  Configuration* configuration;
+
   // If true, print a human-readable representation of parser visits to stderr.
   bool print_parser_visits = false;
 };
 
-void parse_and_lint(Padded_String_View code, Diag_Reporter&,
-                    const Global_Declared_Variable_Set&, Linter_Options);
+void parse_and_lint(Padded_String_View code, Diag_Reporter&, Linter_Options);
 }
 
 // quick-lint-js finds bugs in JavaScript programs.

src/quick-lint-js/lsp/lsp-server.cpp

@@ -785,8 +785,11 @@ void LSP_JavaScript_Linter::lint_and_get_diagnostics(
     Configuration& config, File_Language language, Padded_String_View code,
     Byte_Buffer& diagnostics_json) {
   LSP_Diag_Reporter diag_reporter(qljs_messages, diagnostics_json, code);
-  parse_and_lint(code, diag_reporter, config.globals(),
-                 Linter_Options{.language = language});
+  parse_and_lint(code, diag_reporter,
+                 Linter_Options{
+                     .language = language,
+                     .configuration = &config,
+                 });
   diag_reporter.finish();
 }
 

tools/test-typescript/main.cpp

@@ -5,6 +5,7 @@
 #include <filesystem>
 #include <quick-lint-js/cli/arg-parser.h>
 #include <quick-lint-js/cli/text-diag-reporter.h>
+#include <quick-lint-js/configuration/configuration.h>
 #include <quick-lint-js/container/concat.h>
 #include <quick-lint-js/container/hash-set.h>
 #include <quick-lint-js/container/padded-string.h>
@@ -251,8 +252,9 @@ void process_test_case_file(Expected_Test_Results& expected_results,
     std::exit(1);
   }
 
-  Global_Declared_Variable_Set globals;
-  globals.add_literally_everything();
+  Configuration config;
+  bool ok = config.add_global_group(u8"literally-anything"_sv);
+  QLJS_ALWAYS_ASSERT(ok);
 
   Memory_Output_Stream diags;
   Text_Diag_Reporter text_reporter(Translator(), &diags,
@@ -264,8 +266,11 @@ void process_test_case_file(Expected_Test_Results& expected_results,
     if (language.has_value()) {
       // TODO(strager): Indicate which unit we are looking at.
       text_reporter.set_source(&unit.data, path);
-      parse_and_lint(&unit.data, text_reporter, globals,
-                     Linter_Options{.language = *language});
+      parse_and_lint(&unit.data, text_reporter,
+                     Linter_Options{
+                         .language = *language,
+                         .configuration = &config,
+                     });
     }
   }
   diags.flush();