get tests passing

Author: nathanwhit

Cargo.lock

@@ -33,8 +33,7 @@ harness = false
 anyhow = "1.0.64"
 capacity_builder = "0.5.0"
 # oxc-port: use the local checkout for iteration. Final form:
-# deno_ast = { git = "https://github.com/nathanwhit/deno_ast", branch = "oxc-port" }
-deno_ast = { path = "../deno_ast" }
+deno_ast = { git = "https://github.com/nathanwhit/deno_ast", branch = "oxc-port" }
 dprint-core = { version = "0.67.4", features = ["formatting"] }
 dprint-core-macros = "0.1.0"
 percent-encoding = "2.3.1"

Cargo.toml

@@ -2,17 +2,17 @@ use std::path::Path;
 use std::sync::Arc;
 
 use anyhow::Result;
-use deno_ast::oxc::allocator::Allocator;
 use deno_ast::ParsedSource;
+use deno_ast::oxc::allocator::Allocator;
 use dprint_core::configuration::resolve_new_line_kind;
 use dprint_core::formatting::*;
 
-use crate::swc::ensure_no_specific_syntax_errors;
+use crate::parse::ensure_no_specific_syntax_errors;
 
 use super::configuration::Configuration;
-use super::generation::generate;
 pub use super::generation::ExternalFormatter;
-use super::swc::parse_swc_ast;
+use super::generation::generate;
+use super::parse::parse_ast;
 
 pub struct FormatTextOptions<'a> {
   pub path: &'a Path,
@@ -70,7 +70,7 @@ pub fn format_text(options: FormatTextOptions) -> Result<Option<String>> {
     let file_text = if had_bom { file_text[3..].to_string() } else { file_text };
     let file_text: Arc<str> = file_text.into();
     let allocator = Allocator::default();
-    let parsed_source = parse_swc_ast(&allocator, file_path, file_extension, file_text)?;
+    let parsed_source = parse_ast(&allocator, file_path, file_extension, file_text)?;
     match inner_format(&parsed_source, config, external_formatter)? {
       Some(new_text) => Ok(Some(new_text)),
       None => {
@@ -85,7 +85,11 @@ pub fn format_text(options: FormatTextOptions) -> Result<Option<String>> {
 }
 
 /// Formats an already parsed source. This is useful as a performance optimization.
-pub fn format_parsed_source<'a>(source: &'a ParsedSource<'a>, config: &Configuration, external_formatter: Option<&ExternalFormatter>) -> Result<Option<String>> {
+pub fn format_parsed_source<'a>(
+  source: &'a ParsedSource<'a>,
+  config: &Configuration,
+  external_formatter: Option<&ExternalFormatter>,
+) -> Result<Option<String>> {
   if super::utils::file_text_has_ignore_comment(source.text(), &config.ignore_file_comment_text) {
     Ok(None)
   } else {
@@ -119,7 +123,7 @@ fn inner_format<'a>(parsed_source: &'a ParsedSource<'a>, config: &Configuration,
 #[cfg(feature = "tracing")]
 pub fn trace_file(file_path: &Path, file_text: &str, config: &Configuration) -> dprint_core::formatting::TracingResult {
   let allocator = Allocator::default();
-  let parsed_source = parse_swc_ast(&allocator, file_path, None, file_text.into()).unwrap();
+  let parsed_source = parse_ast(&allocator, file_path, None, file_text.into()).unwrap();
   ensure_no_specific_syntax_errors(&parsed_source).unwrap();
   dprint_core::formatting::trace_printing(|| generate(&parsed_source, config, None).unwrap(), config_to_print_options(file_text, config))
 }

src/format_text.rs

@@ -1,6 +1,6 @@
+use deno_ast::MediaType;
 use deno_ast::oxc::ast::ast::Comment;
 use deno_ast::oxc::parser::Token;
-use deno_ast::MediaType;
 use dprint_core::formatting::ConditionReference;
 use dprint_core::formatting::IndentLevel;
 use dprint_core::formatting::IsStartOfLine;
@@ -9,14 +9,14 @@ use dprint_core::formatting::LineStartIndentLevel;
 use rustc_hash::FxHashMap;
 use rustc_hash::FxHashSet;
 
+use super::CommentTracker;
+use super::TokenFinder;
 use super::oxc_helpers::CommentExt;
 use super::oxc_helpers::Node;
 use super::oxc_helpers::ProgramInfo;
 use super::oxc_helpers::SourcePos;
 use super::oxc_helpers::SourceRange;
 use super::oxc_helpers::SourceRanged;
-use super::CommentTracker;
-use super::TokenFinder;
 use crate::configuration::*;
 use crate::utils::Stack;
 
@@ -71,6 +71,7 @@ pub struct Context<'a> {
   stored_ln: FxHashMap<(SourcePos, SourcePos), LineNumber>,
   stored_il: FxHashMap<(SourcePos, SourcePos), IndentLevel>,
   pub skip_iife_body_indent: bool,
+  pub suppress_synthetic_expr_parens: bool,
   pub end_statement_or_member_lns: Stack<LineNumber>,
   before_comments_start_info_stack: Stack<(SourceRange, LineNumber, IsStartOfLine)>,
   if_stmt_last_brace_condition_ref: Option<ConditionReference>,
@@ -106,6 +107,7 @@ impl<'a> Context<'a> {
       stored_ln: FxHashMap::default(),
       stored_il: FxHashMap::default(),
       skip_iife_body_indent: false,
+      suppress_synthetic_expr_parens: false,
       end_statement_or_member_lns: Default::default(),
       before_comments_start_info_stack: Default::default(),
       if_stmt_last_brace_condition_ref: None,