refactor(fe): simplify interface to parse_and_lint

Accept a File_Language instead of a bunch of booleans. This removes
the need for a helper conversion function in callers.

Author: strager

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

@@ -161,7 +161,7 @@ class QLJS_Lintable_Document : public QLJS_Document_Base {
                                        this->uri());
     parse_and_lint(this->document_.string(), diag_reporter,
                    this->config_->globals(),
-                   get_linter_options_from_language(this->language_));
+                   Linter_Options{.language = this->language_});
 
     return std::move(diag_reporter).diagnostics();
   }

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

@@ -53,9 +53,24 @@ void qljs_web_demo_set_config(QLJS_Web_Demo_Document* js_document,
 
 void qljs_web_demo_set_language_options(QLJS_Web_Demo_Document* p,
                                         QLJS_Language_Options options) {
-  p->linter_options_.jsx = options & qljs_language_options_jsx_bit;
-  p->linter_options_.typescript =
-      options & qljs_language_options_typescript_bit;
+  switch (options & (qljs_language_options_jsx_bit |
+                     qljs_language_options_typescript_bit)) {
+  case 0:
+    p->linter_options_.language = File_Language::javascript;
+    break;
+  case qljs_language_options_jsx_bit:
+    p->linter_options_.language = File_Language::javascript_jsx;
+    break;
+  case qljs_language_options_typescript_bit:
+    p->linter_options_.language = File_Language::typescript;
+    break;
+  case qljs_language_options_jsx_bit | qljs_language_options_typescript_bit:
+    p->linter_options_.language = File_Language::typescript_jsx;
+    break;
+  default:
+    QLJS_UNREACHABLE();
+    break;
+  }
   p->is_config_json_ = options & qljs_language_options_config_json_bit;
 }
 

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

@@ -299,9 +299,10 @@ void run(Options o) {
       if (!source.ok()) {
         source.error().print_and_exit();
       }
-      Linter_Options lint_options =
-          get_linter_options_from_language(get_language(file, o));
-      lint_options.print_parser_visits = o.print_parser_visits;
+      Linter_Options lint_options = {
+          .language = get_language(file, o),
+          .print_parser_visits = o.print_parser_visits,
+      };
       reporter->set_source(&*source, file);
       parse_and_lint(&*source, *reporter->get(), config->globals(),
                      lint_options);

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

@@ -11,63 +11,55 @@
 #include <quick-lint-js/fe/parse.h>
 #include <quick-lint-js/fe/variable-analyzer.h>
 #include <quick-lint-js/io/output-stream.h>
+#include <quick-lint-js/port/unreachable.h>
 
 namespace quick_lint_js {
 bool operator==(Linter_Options lhs, Linter_Options rhs) {
-  return lhs.jsx == rhs.jsx && lhs.typescript == rhs.typescript &&
-         lhs.typescript_definition == rhs.typescript_definition &&
+  return lhs.language == rhs.language &&
          lhs.print_parser_visits == rhs.print_parser_visits;
 }
 
 bool operator!=(Linter_Options lhs, Linter_Options rhs) {
   return !(lhs == rhs);
 }
 
-Linter_Options get_linter_options_from_language(File_Language language) {
-  Linter_Options o;
-  switch (language) {
+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) {
   case File_Language::javascript:
-    o.jsx = false;
-    o.typescript = false;
+    parser_options.jsx = false;
+    parser_options.typescript = false;
     break;
   case File_Language::javascript_jsx:
-    o.jsx = true;
-    o.typescript = false;
+    parser_options.jsx = true;
+    parser_options.typescript = false;
     break;
   case File_Language::typescript:
-    o.jsx = false;
-    o.typescript = true;
+    parser_options.jsx = false;
+    parser_options.typescript = true;
     break;
   case File_Language::typescript_definition:
-    o.jsx = false;
-    o.typescript = true;
-    o.typescript_definition = true;
+    parser_options.jsx = false;
+    parser_options.typescript = true;
+    parser_options.typescript_definition_file = true;
     break;
   case File_Language::typescript_jsx:
-    o.jsx = true;
-    o.typescript = true;
+    parser_options.jsx = true;
+    parser_options.typescript = true;
     break;
   }
-  return o;
-}
 
-void parse_and_lint(Padded_String_View code, Diag_Reporter& reporter,
-                    const Global_Declared_Variable_Set& globals,
-                    Linter_Options options) {
-  Parser p(code, &reporter,
-           Parser_Options{
-               .jsx = options.jsx,
-               .typescript = options.typescript,
-               .typescript_definition_file = options.typescript_definition,
-           });
+  Parser p(code, &reporter, parser_options);
   Variable_Analyzer var_analyzer(
       &reporter, &globals,
       Variable_Analyzer_Options{
-          .allow_deleting_typescript_variable = !options.typescript,
-          .eval_can_declare_variables = !options.typescript,
+          .allow_deleting_typescript_variable = !parser_options.typescript,
+          .eval_can_declare_variables = !parser_options.typescript,
           // TODO(strager): Deduplicate with typescript_var_options in tests.
-          .can_assign_to_class = !options.typescript,
-          .import_variable_can_be_runtime_or_type = options.typescript,
+          .can_assign_to_class = !parser_options.typescript,
+          .import_variable_can_be_runtime_or_type = parser_options.typescript,
       });
 
 #if defined(__EMSCRIPTEN__)

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

@@ -12,17 +12,7 @@ class Padded_String_View;
 
 // TODO(#465): Accept parser options from quick-lint-js.config or CLI options.
 struct Linter_Options {
-  // If true, parse and lint JSX language extensions:
-  // https://facebook.github.io/jsx/
-  bool jsx = true;
-
-  // If true, parse and lint TypeScript instead of JavaScript.
-  bool typescript = false;
-
-  // If true, parse as a TypeScript definition file (.d.ts).
-  //
-  // Invariant: typescript_definition implies typescript.
-  bool typescript_definition = false;
+  File_Language language;
 
   // If true, print a human-readable representation of parser visits to stderr.
   bool print_parser_visits = false;
@@ -31,8 +21,6 @@ struct Linter_Options {
   friend bool operator!=(Linter_Options, Linter_Options);
 };
 
-Linter_Options get_linter_options_from_language(File_Language);
-
 void parse_and_lint(Padded_String_View code, Diag_Reporter&,
                     const Global_Declared_Variable_Set&, Linter_Options);
 }

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

@@ -754,7 +754,7 @@ LSP_Linter::~LSP_Linter() = default;
 void LSP_Linter::lint(LSP_Documents::Lintable_Document& doc,
                       String8_View uri_json,
                       Outgoing_JSON_RPC_Message_Queue& outgoing_messages) {
-  this->lint(*doc.config, get_linter_options_from_language(doc.language),
+  this->lint(*doc.config, Linter_Options{.language = doc.language},
              doc.doc.string(), uri_json, doc.version_json, outgoing_messages);
 }
 

test/test-lsp-server.cpp

@@ -607,8 +607,7 @@ TEST_F(Test_Linting_LSP_Server, javascript_language_ids_enable_jsx) {
     auto lint_callback = [&](Configuration&, Linter_Options lint_options,
                              Padded_String_View, String8_View, String8_View,
                              Outgoing_JSON_RPC_Message_Queue&) {
-      EXPECT_TRUE(lint_options.jsx);
-      EXPECT_FALSE(lint_options.typescript);
+      EXPECT_EQ(lint_options.language, File_Language::javascript_jsx);
     };
     this->linter.lint_callback = lint_callback;
 
@@ -640,8 +639,7 @@ TEST_F(Test_Linting_LSP_Server, typescript_language_ids_enable_typescript) {
     auto lint_callback = [&](Configuration&, Linter_Options lint_options,
                              Padded_String_View, String8_View, String8_View,
                              Outgoing_JSON_RPC_Message_Queue&) {
-      EXPECT_TRUE(lint_options.typescript);
-      EXPECT_FALSE(lint_options.jsx);
+      EXPECT_EQ(lint_options.language, File_Language::typescript);
     };
     this->linter.lint_callback = lint_callback;
 
@@ -673,8 +671,7 @@ TEST_F(Test_Linting_LSP_Server, tsx_language_ids_enable_typescript_jsx) {
     auto lint_callback = [&](Configuration&, Linter_Options lint_options,
                              Padded_String_View, String8_View, String8_View,
                              Outgoing_JSON_RPC_Message_Queue&) {
-      EXPECT_TRUE(lint_options.typescript);
-      EXPECT_TRUE(lint_options.jsx);
+      EXPECT_EQ(lint_options.language, File_Language::typescript_jsx);
     };
     this->linter.lint_callback = lint_callback;
 

test/test-typescript-test.cpp

@@ -215,8 +215,7 @@ TEST(Test_TypeScript_Test, typescript_file_is_linted) {
     ASSERT_EQ(units.size(), 2);
     std::optional<Linter_Options> options = units[0].get_linter_options();
     ASSERT_TRUE(options.has_value());
-    EXPECT_TRUE(options->typescript);
-    EXPECT_FALSE(options->jsx);
+    EXPECT_EQ(options->language, File_Language::typescript);
   }
 
   {
@@ -229,8 +228,7 @@ TEST(Test_TypeScript_Test, typescript_file_is_linted) {
     ASSERT_EQ(units.size(), 2);
     std::optional<Linter_Options> options = units[1].get_linter_options();
     ASSERT_TRUE(options.has_value());
-    EXPECT_TRUE(options->typescript);
-    EXPECT_FALSE(options->jsx);
+    EXPECT_EQ(options->language, File_Language::typescript);
   }
 }
 
@@ -245,8 +243,7 @@ TEST(Test_TypeScript_Test, typescript_react_file_is_linted) {
     ASSERT_EQ(units.size(), 2);
     std::optional<Linter_Options> options = units[0].get_linter_options();
     ASSERT_TRUE(options.has_value());
-    EXPECT_TRUE(options->typescript);
-    EXPECT_TRUE(options->jsx);
+    EXPECT_EQ(options->language, File_Language::typescript_jsx);
   }
 
   {
@@ -259,8 +256,7 @@ TEST(Test_TypeScript_Test, typescript_react_file_is_linted) {
     ASSERT_EQ(units.size(), 2);
     std::optional<Linter_Options> options = units[1].get_linter_options();
     ASSERT_TRUE(options.has_value());
-    EXPECT_TRUE(options->typescript);
-    EXPECT_TRUE(options->jsx);
+    EXPECT_EQ(options->language, File_Language::typescript_jsx);
   }
 }
 
@@ -273,9 +269,7 @@ TEST(Test_TypeScript_Test, typescript_definition_file) {
   ASSERT_EQ(units.size(), 1);
   std::optional<Linter_Options> options = units[0].get_linter_options();
   ASSERT_TRUE(options.has_value());
-  EXPECT_TRUE(options->typescript);
-  EXPECT_TRUE(options->typescript_definition);
-  EXPECT_FALSE(options->jsx);
+  EXPECT_EQ(options->language, File_Language::typescript_definition);
 }
 
 TEST(Test_TypeScript_Test, typescript_definition_file_with_weird_extension) {
@@ -287,8 +281,7 @@ TEST(Test_TypeScript_Test, typescript_definition_file_with_weird_extension) {
   ASSERT_EQ(units.size(), 1);
   std::optional<Linter_Options> options = units[0].get_linter_options();
   ASSERT_TRUE(options.has_value());
-  EXPECT_TRUE(options->typescript);
-  EXPECT_TRUE(options->typescript_definition);
+  EXPECT_EQ(options->language, File_Language::typescript_definition);
 }
 
 TEST(Test_TypeScript_Test, javascript_file_is_linted) {
@@ -303,17 +296,13 @@ TEST(Test_TypeScript_Test, javascript_file_is_linted) {
 
     std::optional<Linter_Options> options = units[0].get_linter_options();
     ASSERT_TRUE(options.has_value());
-    EXPECT_FALSE(options->typescript);
-    // FIXME(strager): Should we only set jsx=true if a @jsx directive is
-    // present?
-    EXPECT_TRUE(options->jsx);
+    // FIXME(strager): Should we only enable jsx if a @jsx directive is present?
+    EXPECT_EQ(options->language, File_Language::javascript_jsx);
 
     options = units[1].get_linter_options();
     ASSERT_TRUE(options.has_value());
-    EXPECT_FALSE(options->typescript);
-    // FIXME(strager): Should we only set jsx=true if a @jsx directive is
-    // present?
-    EXPECT_TRUE(options->jsx);
+    // FIXME(strager): Should we only enable jsx if a @jsx directive is present?
+    EXPECT_EQ(options->language, File_Language::javascript_jsx);
   }
 }
 
@@ -329,13 +318,11 @@ TEST(Test_TypeScript_Test, javascript_react_file_is_linted) {
 
     std::optional<Linter_Options> options = units[0].get_linter_options();
     ASSERT_TRUE(options.has_value());
-    EXPECT_FALSE(options->typescript);
-    EXPECT_TRUE(options->jsx);
+    EXPECT_EQ(options->language, File_Language::javascript_jsx);
 
     options = units[1].get_linter_options();
     ASSERT_TRUE(options.has_value());
-    EXPECT_FALSE(options->typescript);
-    EXPECT_TRUE(options->jsx);
+    EXPECT_EQ(options->language, File_Language::javascript_jsx);
   }
 }
 

tools/test-typescript/typescript-test.cpp

@@ -134,20 +134,19 @@ std::optional<Linter_Options> TypeScript_Test_Unit::get_linter_options() const {
     return std::nullopt;
   }
   if (contains(String8_View(this->name), u8".d."_sv)) {
-    return Linter_Options{
-        .jsx = false, .typescript = true, .typescript_definition = true};
+    return Linter_Options{.language = File_Language::typescript_definition};
   }
   if (ends_with(String8_View(this->name), u8".ts"_sv)) {
-    return Linter_Options{.jsx = false, .typescript = true};
+    return Linter_Options{.language = File_Language::typescript};
   }
   if (ends_with(String8_View(this->name), u8".tsx"_sv)) {
-    return Linter_Options{.jsx = true, .typescript = true};
+    return Linter_Options{.language = File_Language::typescript_jsx};
   }
   if (ends_with(String8_View(this->name), u8".js"_sv)) {
-    return Linter_Options{.jsx = true, .typescript = false};
+    return Linter_Options{.language = File_Language::javascript_jsx};
   }
   if (ends_with(String8_View(this->name), u8".jsx"_sv)) {
-    return Linter_Options{.jsx = true, .typescript = false};
+    return Linter_Options{.language = File_Language::javascript_jsx};
   }
   // Don't lint unknown file extensions. See
   // TypeScript/tests/cases/conformance/moduleResolution/bundler/bundlerImportTsExtensions.ts