refactor(formatter): Export unified way to get_parse_options

Author: leaysgur

apps/oxfmt/src/service.rs

@@ -5,8 +5,8 @@ use rayon::prelude::*;
 
 use oxc_allocator::Allocator;
 use oxc_diagnostics::{DiagnosticSender, DiagnosticService, OxcDiagnostic};
-use oxc_formatter::{FormatOptions, Formatter, enable_jsx_source_type};
-use oxc_parser::{ParseOptions, Parser};
+use oxc_formatter::{FormatOptions, Formatter, enable_jsx_source_type, get_parse_options};
+use oxc_parser::Parser;
 
 use crate::{command::OutputOptions, walk::WalkEntry};
 
@@ -53,14 +53,7 @@ impl FormatService {
         let allocator = Allocator::new();
 
         let ret = Parser::new(&allocator, &source_text, source_type)
-            .with_options(ParseOptions {
-                parse_regular_expression: false,
-                // Enable all syntax features
-                allow_v8_intrinsics: true,
-                allow_return_outside_function: true,
-                // `oxc_formatter` expects this to be false
-                preserve_parens: false,
-            })
+            .with_options(get_parse_options())
             .parse();
         if !ret.errors.is_empty() {
             let diagnostics = DiagnosticService::wrap_diagnostics(

crates/oxc_formatter/Cargo.toml

@@ -23,6 +23,7 @@ doctest = false
 oxc_allocator = { workspace = true }
 oxc_ast = { workspace = true }
 oxc_data_structures = { workspace = true, features = ["stack"] }
+oxc_parser = { workspace = true }
 oxc_span = { workspace = true }
 oxc_syntax = { workspace = true }
 
@@ -36,7 +37,6 @@ unicode-width = "0.2"
 
 [dev-dependencies]
 insta = { workspace = true }
-oxc_parser = { workspace = true }
 pico-args = { workspace = true }
 project-root = { workspace = true }
 serde_json = { workspace = true }

crates/oxc_formatter/examples/formatter.rs

@@ -14,8 +14,8 @@
 use std::{fs, path::Path};
 
 use oxc_allocator::Allocator;
-use oxc_formatter::{BracketSameLine, FormatOptions, Formatter, Semicolons};
-use oxc_parser::{ParseOptions, Parser};
+use oxc_formatter::{BracketSameLine, FormatOptions, Formatter, Semicolons, get_parse_options};
+use oxc_parser::Parser;
 use oxc_span::SourceType;
 use pico_args::Arguments;
 
@@ -34,14 +34,7 @@ fn main() -> Result<(), String> {
 
     // Parse the source code
     let ret = Parser::new(&allocator, &source_text, source_type)
-        .with_options(ParseOptions {
-            parse_regular_expression: false,
-            // Enable all syntax features
-            allow_v8_intrinsics: true,
-            allow_return_outside_function: true,
-            // `oxc_formatter` expects this to be false
-            preserve_parens: false,
-        })
+        .with_options(get_parse_options())
         .parse();
 
     // Report any parsing errors

crates/oxc_formatter/examples/sort_imports.rs

@@ -3,8 +3,8 @@
 use std::{fs, path::Path};
 
 use oxc_allocator::Allocator;
-use oxc_formatter::{FormatOptions, Formatter, SortImports, SortOrder};
-use oxc_parser::{ParseOptions, Parser};
+use oxc_formatter::{FormatOptions, Formatter, SortImports, SortOrder, get_parse_options};
+use oxc_parser::Parser;
 use oxc_span::SourceType;
 use pico_args::Arguments;
 
@@ -36,14 +36,7 @@ fn main() -> Result<(), String> {
 
     // Parse the source code
     let ret = Parser::new(&allocator, &source_text, source_type)
-        .with_options(ParseOptions {
-            parse_regular_expression: false,
-            // Enable all syntax features
-            allow_v8_intrinsics: true,
-            allow_return_outside_function: true,
-            // `oxc_formatter` expects this to be false
-            preserve_parens: false,
-        })
+        .with_options(get_parse_options())
         .parse();
 
     // Report any parsing errors

crates/oxc_formatter/src/lib.rs

@@ -32,10 +32,7 @@ use rustc_hash::{FxHashMap, FxHashSet};
 use write::FormatWrite;
 
 pub use crate::options::*;
-pub use crate::service::{
-    oxfmtrc::Oxfmtrc,
-    source_type::{enable_jsx_source_type, get_supported_source_type},
-};
+pub use crate::service::{oxfmtrc::Oxfmtrc, parse_utils::*};
 use crate::{
     ast_nodes::{AstNode, AstNodes},
     formatter::{FormatContext, Formatted, format_element::document::Document},

crates/oxc_formatter/src/service/mod.rs

@@ -1,2 +1,2 @@
 pub mod oxfmtrc;
-pub mod source_type;
+pub mod parse_utils;

crates/oxc_formatter/src/service/source_type.rs renamed to crates/oxc_formatter/src/service/parse_utils.rs

@@ -1,7 +1,20 @@
 use std::ffi::OsStr;
 
+use oxc_parser::ParseOptions;
 use oxc_span::SourceType;
 
+pub fn get_parse_options() -> ParseOptions {
+    ParseOptions {
+        // Do not need to parse regexp
+        parse_regular_expression: false,
+        // Enable all syntax features
+        allow_return_outside_function: true,
+        allow_v8_intrinsics: true,
+        // `oxc_formatter` expects this to be `false`, otherwise panics
+        preserve_parens: false,
+    }
+}
+
 // Additional extensions from linguist-languages, which Prettier also supports
 // - https://github.com/ikatyang-collab/linguist-languages/blob/d1dc347c7ced0f5b42dd66c7d1c4274f64a3eb6b/data/JavaScript.js
 // No special extensions for TypeScript

crates/oxc_formatter/tests/fixtures/mod.rs

@@ -3,9 +3,9 @@ use std::{env::current_dir, fs, path::Path, str::FromStr};
 use oxc_allocator::Allocator;
 use oxc_formatter::{
     ArrowParentheses, BracketSameLine, BracketSpacing, FormatOptions, Formatter, IndentStyle,
-    IndentWidth, LineWidth, QuoteStyle, Semicolons, TrailingCommas,
+    IndentWidth, LineWidth, QuoteStyle, Semicolons, TrailingCommas, get_parse_options,
 };
-use oxc_parser::{ParseOptions, Parser};
+use oxc_parser::Parser;
 use oxc_span::SourceType;
 
 type OptionSet = serde_json::Map<String, serde_json::Value>;
@@ -141,14 +141,8 @@ fn format_options_display(json: &OptionSet) -> String {
 /// Format a source file with given options
 fn format_source(source_text: &str, source_type: SourceType, options: FormatOptions) -> String {
     let allocator = Allocator::default();
-    let ret = Parser::new(&allocator, source_text, source_type)
-        .with_options(ParseOptions {
-            parse_regular_expression: false,
-            allow_v8_intrinsics: true,
-            allow_return_outside_function: true,
-            preserve_parens: false,
-        })
-        .parse();
+    let ret =
+        Parser::new(&allocator, source_text, source_type).with_options(get_parse_options()).parse();
 
     let formatter = Formatter::new(&allocator, options);
     formatter.build(&ret.program)

crates/oxc_formatter/tests/ir_transform/mod.rs

@@ -39,23 +39,14 @@ pub fn assert_format(code: &str, options: &FormatOptions, expected: &str) {
 
 fn format_code(code: &str, options: &FormatOptions) -> String {
     use oxc_allocator::Allocator;
-    use oxc_formatter::Formatter;
-    use oxc_parser::{ParseOptions, Parser};
+    use oxc_formatter::{Formatter, get_parse_options};
+    use oxc_parser::Parser;
     use oxc_span::SourceType;
 
     let allocator = Allocator::new();
     let source_type = SourceType::from_path("dummy.tsx").unwrap();
 
-    let ret = Parser::new(&allocator, code, source_type)
-        .with_options(ParseOptions {
-            parse_regular_expression: false,
-            // Enable all syntax features
-            allow_v8_intrinsics: true,
-            allow_return_outside_function: true,
-            // `oxc_formatter` expects this to be false
-            preserve_parens: false,
-        })
-        .parse();
+    let ret = Parser::new(&allocator, code, source_type).with_options(get_parse_options()).parse();
 
     if let Some(error) = ret.errors.first() {
         panic!("💥 Parser error: {}", error.message);

crates/oxc_language_server/src/formatter/server_formatter.rs

@@ -4,9 +4,10 @@ use log::warn;
 use oxc_allocator::Allocator;
 use oxc_data_structures::rope::{Rope, get_line_column};
 use oxc_formatter::{
-    FormatOptions, Formatter, Oxfmtrc, enable_jsx_source_type, get_supported_source_type,
+    FormatOptions, Formatter, Oxfmtrc, enable_jsx_source_type, get_parse_options,
+    get_supported_source_type,
 };
-use oxc_parser::{ParseOptions, Parser};
+use oxc_parser::Parser;
 use tower_lsp_server::{
     UriExt,
     lsp_types::{Pattern, Position, Range, TextEdit, Uri},
@@ -42,14 +43,7 @@ impl ServerFormatter {
 
         let allocator = Allocator::new();
         let ret = Parser::new(&allocator, &source_text, source_type)
-            .with_options(ParseOptions {
-                parse_regular_expression: false,
-                // Enable all syntax features
-                allow_v8_intrinsics: true,
-                allow_return_outside_function: true,
-                // `oxc_formatter` expects this to be false
-                preserve_parens: false,
-            })
+            .with_options(get_parse_options())
             .parse();
 
         if !ret.errors.is_empty() {