chore: solar-powered fmt rollout (#11570)

Author: 0xrusowsky

Cargo.lock

@@ -20,7 +20,6 @@ members = [
     "crates/evm/fuzz/",
     "crates/evm/traces/",
     "crates/fmt/",
-    "crates/fmt-2/",
     "crates/forge/",
     "crates/script-sequence/",
     "crates/macros/",

Cargo.toml

@@ -19,6 +19,7 @@ path = "bin/main.rs"
 
 [dependencies]
 # forge
+forge-doc.workspace = true
 forge-fmt.workspace = true
 foundry-cli.workspace = true
 foundry-common.workspace = true

crates/chisel/Cargo.toml

@@ -9,8 +9,7 @@ use crate::{
 };
 use alloy_primitives::{Address, hex};
 use eyre::{Context, Result};
-use forge_fmt::FormatterConfig;
-use foundry_config::RpcEndpointUrl;
+use foundry_config::{FormatterConfig, RpcEndpointUrl};
 use foundry_evm::{
     decode::decode_console_logs,
     traces::{
@@ -66,18 +65,8 @@ pub struct EtherscanABIResponse {
 
 /// Helper function that formats solidity source with the given [FormatterConfig]
 pub fn format_source(source: &str, config: FormatterConfig) -> eyre::Result<String> {
-    match forge_fmt::parse(source) {
-        Ok(parsed) => {
-            let mut formatted_source = String::default();
-
-            if forge_fmt::format_to(&mut formatted_source, parsed, config).is_err() {
-                eyre::bail!("Could not format source!");
-            }
-
-            Ok(formatted_source)
-        }
-        Err(_) => eyre::bail!("Formatter could not parse source!"),
-    }
+    let formatted = forge_fmt::format(source, config).into_result()?;
+    Ok(formatted)
 }
 
 impl ChiselDispatcher {

crates/chisel/src/dispatcher.rs

@@ -5,7 +5,7 @@
 //! execution helpers.
 
 use eyre::Result;
-use forge_fmt::solang_ext::{CodeLocationExt, SafeUnwrap};
+use forge_doc::solang_ext::{CodeLocationExt, SafeUnwrap};
 use foundry_common::fs;
 use foundry_compilers::{
     Artifact, ProjectCompileOutput,

crates/chisel/src/source.rs

@@ -2,6 +2,7 @@ use alloy_json_abi::JsonAbi;
 use alloy_primitives::{U256, map::HashMap};
 use alloy_provider::{Provider, network::AnyNetwork};
 use eyre::{ContextCompat, Result};
+use forge_fmt::FormatterConfig;
 use foundry_common::{
     provider::{ProviderBuilder, RetryProvider},
     shell,
@@ -100,7 +101,7 @@ fn env_filter() -> tracing_subscriber::EnvFilter {
 
 pub fn abi_to_solidity(abi: &JsonAbi, name: &str) -> Result<String> {
     let s = abi.to_sol(name, None);
-    let s = forge_fmt::format(&s)?;
+    let s = forge_fmt::format(&s, FormatterConfig::default()).into_result()?;
     Ok(s)
 }
 

crates/cli/src/utils/mod.rs

@@ -19,6 +19,7 @@ foundry-common.workspace = true
 foundry-compilers.workspace = true
 foundry-config.workspace = true
 
+solar-interface.workspace = true
 alloy-primitives.workspace = true
 
 derive_more.workspace = true

crates/doc/Cargo.toml

@@ -1,12 +1,11 @@
 use crate::{
     AsDoc, BufWriter, Document, ParseItem, ParseSource, Parser, Preprocessor,
-    document::DocumentContent, helpers::merge_toml_table,
+    document::DocumentContent, helpers::merge_toml_table, solang_ext::Visitable,
 };
 use alloy_primitives::map::HashMap;
 use eyre::{Context, Result};
-use forge_fmt::{FormatterConfig, Visitable};
 use foundry_compilers::{compilers::solc::SOLC_EXTENSIONS, utils::source_files_iter};
-use foundry_config::{DocConfig, filter::expand_globs};
+use foundry_config::{DocConfig, FormatterConfig, filter::expand_globs};
 use itertools::Itertools;
 use mdbook::MDBook;
 use rayon::prelude::*;

crates/doc/src/builder.rs

@@ -31,3 +31,6 @@ mod writer;
 pub use writer::{AsDoc, AsDocResult, BufWriter, Markdown};
 
 pub use mdbook;
+
+// old formatter dependencies
+pub mod solang_ext;

crates/doc/src/lib.rs

@@ -1,4 +1,4 @@
-use forge_fmt::FormatterError;
+use solar_interface::diagnostics::EmittedDiagnostics;
 use thiserror::Error;
 
 /// The parser error.
@@ -7,7 +7,7 @@ use thiserror::Error;
 pub enum ParserError {
     /// Formatter error.
     #[error(transparent)]
-    Formatter(#[from] FormatterError),
+    Formatter(EmittedDiagnostics),
     /// Internal parser error.
     #[error(transparent)]
     Internal(#[from] eyre::Error),