diff --git a/crates/lang/src/format.rs b/crates/lang/src/format.rs index b01eb2e4..a3c2640e 100644 --- a/crates/lang/src/format.rs +++ b/crates/lang/src/format.rs @@ -119,7 +119,7 @@ impl<'comments> Formatter<'comments> { end != 0 } - fn definitions<'a>(&mut self, definitions: &'a [UntypedDefinition]) -> Vec> { + fn definitions<'a>(&mut self, definitions: &'a [UntypedDefinition]) -> Document<'a> { let mut has_imports = false; let mut has_declarations = false; let mut imports = Vec::new(); @@ -161,11 +161,11 @@ impl<'comments> Formatter<'comments> { nil() }; - vec![imports, sep, declarations] + docvec![imports, sep, declarations] } fn module<'a>(&mut self, module: &'a UntypedModule) -> Document<'a> { - let groups = join(self.definitions(&module.definitions), lines(2)); + let groups = self.definitions(&module.definitions); // Now that `groups` has been collected, only freestanding comments (//) // and doc comments (///) remain. Freestanding comments aren't associated diff --git a/examples/sample/src/sample.ak b/examples/sample/src/sample.ak index 4a01b793..338ec93f 100644 --- a/examples/sample/src/sample.ak +++ b/examples/sample/src/sample.ak @@ -1,5 +1 @@ - - - - pub type ScriptContext { thing: String } diff --git a/examples/sample/src/sample/context.ak b/examples/sample/src/sample/context.ak index 0b3f2838..f735f573 100644 --- a/examples/sample/src/sample/context.ak +++ b/examples/sample/src/sample/context.ak @@ -1,7 +1,3 @@ - - - - pub type ScriptContext(purpose) { tx_info: TxInfo, script_purpose: purpose } pub type TxInfo { idk: Int } diff --git a/examples/sample/src/sample/mint.ak b/examples/sample/src/sample/mint.ak index b687e34c..7eb82d5a 100644 --- a/examples/sample/src/sample/mint.ak +++ b/examples/sample/src/sample/mint.ak @@ -1,10 +1,6 @@ use sample/context - - - - -pub type Mint { currency_symbol: ByteArray } +pub type Mint { currency_symbol: ByteArray, thing: Int, thing: Int, thing: Int } pub type ScriptContext = context.ScriptContext(Mint) diff --git a/examples/sample/src/sample/spend.ak b/examples/sample/src/sample/spend.ak index 984923ed..b06fd1f7 100644 --- a/examples/sample/src/sample/spend.ak +++ b/examples/sample/src/sample/spend.ak @@ -1,9 +1,5 @@ use sample/context - - - - pub type Spend { idk: Int } pub type ScriptContext = diff --git a/examples/sample/src/scripts/swap.ak b/examples/sample/src/scripts/swap.ak index f0f15a3a..8910d81d 100644 --- a/examples/sample/src/scripts/swap.ak +++ b/examples/sample/src/scripts/swap.ak @@ -1,10 +1,6 @@ use sample/mint use sample/spend - - - - pub type Datum { something: String } pub type Redeemer {