fix: statement formatting tweaks

Signed-off-by: Christian Stewart <[email protected]>

Author: paralin

compiler/stmt.go

@@ -346,16 +346,19 @@ func (c *GoToTSCompiler) WriteStmtSend(exp *ast.SendStmt) error {
 // The function aims to produce idiomatic TypeScript `if/else if/else` structures.
 func (s *GoToTSCompiler) WriteStmtIf(exp *ast.IfStmt) error {
 	if exp.Init != nil {
-		s.tsw.WriteLiterally("{")
-		s.tsw.Indent(1)
+		s.tsw.WriteLiterally("{") // Write opening brace
+		s.tsw.WriteLine("")       // Add newline immediately after opening brace
+		s.tsw.Indent(1)           // Indent for the initializer
 
-		if err := s.WriteStmt(exp.Init); err != nil {
+		if err := s.WriteStmt(exp.Init); err != nil { // Write the initializer
 			return err
 		}
 
+		// This defer handles closing the synthetic block for the initializer
 		defer func() {
 			s.tsw.Indent(-1)
-			s.tsw.WriteLiterally("}")
+			s.tsw.WriteLiterally("}") // Write the closing brace at the now-correct indent level
+			s.tsw.WriteLine("")       // Ensure a newline *after* this '}', critical for preventing '}}'
 		}()
 	}
 
@@ -696,6 +699,7 @@ func (c *GoToTSCompiler) WriteStmtDefer(exp *ast.DeferStmt) error {
 		if err := c.WriteValueExpr(exp.Call); err != nil {
 			return fmt.Errorf("failed to write deferred call: %w", err)
 		}
+		c.tsw.WriteLine("")
 	}
 
 	c.tsw.Indent(-1)

compliance/tests/chan_type_assertion/chan_type_assertion.gs.ts

@@ -10,70 +10,88 @@ export function main(): void {
 	let ch4 = $.makeChannel<{  }>(0, {}, 'both')
 
 	let i: null | any = ch1
-	{let { ok: ok } = $.typeAssert<$.Channel<number>>(i, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'both'})
+	{
+		let { ok: ok } = $.typeAssert<$.Channel<number>>(i, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'both'})
 		if (ok) {
 			console.log("i is chan int: ok")
 		} else {
 			console.log("i is chan int: failed")
 		}
 	}
+
 	let s: null | any = ch2
-	{let { ok: ok } = $.typeAssert<$.Channel<string>>(s, {kind: $.TypeKind.Channel, elemType: 'string', direction: 'send'})
+	{
+		let { ok: ok } = $.typeAssert<$.Channel<string>>(s, {kind: $.TypeKind.Channel, elemType: 'string', direction: 'send'})
 		if (ok) {
 			console.log("s is chan<- string: ok")
 		} else {
 			console.log("s is chan<- string: failed")
 		}
 	}
+
 	let r: null | any = ch3
-	{let { ok: ok } = $.typeAssert<$.Channel<number>>(r, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'receive'})
+	{
+		let { ok: ok } = $.typeAssert<$.Channel<number>>(r, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'receive'})
 		if (ok) {
 			console.log("r is <-chan float64: ok")
 		} else {
 			console.log("r is <-chan float64: failed")
 		}
 	}
+
 	let e: null | any = ch4
-	{let { ok: ok } = $.typeAssert<$.Channel<{  }>>(e, {kind: $.TypeKind.Channel, elemType: {kind: $.TypeKind.Struct, fields: {}, methods: []}, direction: 'both'})
+	{
+		let { ok: ok } = $.typeAssert<$.Channel<{  }>>(e, {kind: $.TypeKind.Channel, elemType: {kind: $.TypeKind.Struct, fields: {}, methods: []}, direction: 'both'})
 		if (ok) {
 			console.log("e is chan struct{}: ok")
 		} else {
 			console.log("e is chan struct{}: failed")
 		}
 	}
-	{let { ok: ok } = $.typeAssert<$.Channel<string>>(i, {kind: $.TypeKind.Channel, elemType: 'string', direction: 'both'})
+
+	{
+		let { ok: ok } = $.typeAssert<$.Channel<string>>(i, {kind: $.TypeKind.Channel, elemType: 'string', direction: 'both'})
 		if (ok) {
 			console.log("i is chan string: incorrect")
 		} else {
 			console.log("i is chan string: correctly failed")
 		}
 	}
-	{let { ok: ok } = $.typeAssert<$.Channel<number>>(i, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'send'})
+
+	{
+		let { ok: ok } = $.typeAssert<$.Channel<number>>(i, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'send'})
 		if (ok) {
 			console.log("i is chan<- int: incorrect")
 		} else {
 			console.log("i is chan<- int: correctly failed")
 		}
 	}
-	{let { ok: ok } = $.typeAssert<$.Channel<number>>(i, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'receive'})
+
+	{
+		let { ok: ok } = $.typeAssert<$.Channel<number>>(i, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'receive'})
 		if (ok) {
 			console.log("i is <-chan int: incorrect")
 		} else {
 			console.log("i is <-chan int: correctly failed")
 		}
 	}
-	{let { ok: ok } = $.typeAssert<$.Channel<number>>(i, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'send'})
+
+	{
+		let { ok: ok } = $.typeAssert<$.Channel<number>>(i, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'send'})
 		if (ok) {
 			console.log("bidirectional can be used as send-only: ok")
 		} else {
 			console.log("bidirectional can be used as send-only: failed")
 		}
 	}
-	{let { ok: ok } = $.typeAssert<$.Channel<number>>(i, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'receive'})
+
+	{
+		let { ok: ok } = $.typeAssert<$.Channel<number>>(i, {kind: $.TypeKind.Channel, elemType: 'number', direction: 'receive'})
 		if (ok) {
 			console.log("bidirectional can be used as receive-only: ok")
 		} else {
 			console.log("bidirectional can be used as receive-only: failed")
 		}
-	}}
+	}
+}
 

compliance/tests/defer_statement/defer_statement.gs.ts

@@ -6,7 +6,8 @@ import * as $ from "@goscript/builtin";
 export function main(): void {
 	using __defer = new $.DisposableStack();
 	__defer.defer(() => {
-		console.log("deferred")});
+		console.log("deferred")
+	});
 	console.log("main")
 }