CoderLine · Danielku15 · Feb 26, 2025 · Feb 25, 2025
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -91,6 +91,7 @@
         "mocha": "^11.1.0",
         "multer": "^1.4.5-lts.1",
         "opener": "^1.5.2",
+        "prettier": "^3.5.2",
         "rimraf": "^6.0.1",
         "rollup": "^4.34.8",
         "rollup-plugin-copy": "^3.5.0",

diff --git a/scripts/setup-playground.js b/scripts/setup-playground.js
@@ -1,5 +1,7 @@
-const fs = require('fs-extra');
+import fs from 'fs-extra';
+import url from 'url';
 
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 const src = `${__dirname}/../playground-template`
 const dest = `${__dirname}/../playground`
 fs.copySync(src, dest, { overwrite: false });
diff --git a/src.compiler/csharp/CSharpAst.ts b/src.compiler/csharp/CSharpAst.ts
@@ -226,13 +226,13 @@ export interface ParameterDeclaration extends NamedElement, Node, DocumentedElem
     type?: TypeNode;
     initializer?: Expression;
     params: boolean;
+    isOptional: boolean;
 }
 
 // Type System
 
 export interface TypeNode extends Node {
     isNullable?: boolean;
-    isOptional?: boolean;
 }
 
 export interface UnresolvedTypeNode extends TypeNode {

diff --git a/src.compiler/csharp/CSharpAstPrinter.ts b/src.compiler/csharp/CSharpAstPrinter.ts
@@ -161,7 +161,7 @@ export default class CSharpAstPrinter extends AstPrinterBase {
         if (p.initializer) {
             this.write(' = ');
             this.writeExpression(p.initializer);
-        } else if (p.type && p.type.isOptional) {
+        } else if (p.type && p.isOptional) {
             this.write(' = default');
         }
     }
@@ -308,7 +308,7 @@ export default class CSharpAstPrinter extends AstPrinterBase {
                             nodeType: cs.SyntaxKind.Identifier,
                             text: p.name,
                             tsNode: defaultConstructor.tsNode
-                        } as cs.Identifier)
+                        }) as cs.Identifier
                 );
                 this.writeMember(defaultConstructor);
             }
@@ -660,7 +660,7 @@ export default class CSharpAstPrinter extends AstPrinterBase {
                 this.write('TODO: ' + cs.SyntaxKind[type.nodeType]);
                 break;
         }
-        if (type.isNullable && !forNew && !forTypeConstraint) {
+        if ((type.isNullable) && !forNew && !forTypeConstraint) {
             this.write('?');
         }
     }

diff --git a/src.compiler/csharp/CSharpAstTransformer.ts b/src.compiler/csharp/CSharpAstTransformer.ts
@@ -602,6 +602,8 @@ export default class CSharpAstTransformer {
 
         parent.members.push(csMethod);
         this._context.registerSymbol(csMethod);
+
+        return csMethod;
     }
 
     protected visitTestMethod(parent: cs.ClassDeclaration, d: ts.CallExpression) {
@@ -1861,6 +1863,10 @@ export default class CSharpAstTransformer {
             ];
         }
 
+        if (s.finallyBlock) {
+            tryStatement.finallyBlock = this.visitBlock(tryStatement, s.finallyBlock);
+        }
+
         return tryStatement;
     }
 
@@ -1967,23 +1973,16 @@ export default class CSharpAstTransformer {
             parent: csMethod,
             type: this.createUnresolvedTypeNode(null, p.type ?? p, type),
             tsNode: p,
-            params: !!p.dotDotDotToken
+            params: !!p.dotDotDotToken,
+            isOptional: !!p.questionToken
         };
         csParameter.type!.parent = csParameter;
 
-        if (p.questionToken) {
-            csParameter.type!.isOptional = true;
-        }
-
         if (p.initializer) {
             csParameter.initializer = this.visitExpression(csParameter, p.initializer) ?? undefined;
             if (csParameter.initializer && cs.isNullLiteral(csParameter.initializer)) {
                 csParameter.type!.isNullable = true;
             }
-        } else if (csParameter.type!.isOptional) {
-            if (this._context.isDefaultValueNull(type)) {
-                csParameter.type!.isNullable = true;
-            }
         }
 
         if (p.name) {

diff --git a/src.compiler/csharp/CSharpEmitterContext.ts b/src.compiler/csharp/CSharpEmitterContext.ts
@@ -241,17 +241,13 @@ export default class CSharpEmitterContext {
         }
 
         if (resolved) {
-            const wasOptional = node.isOptional;
             const wasNullable = node.isNullable;
             for (const prop of Object.getOwnPropertyNames(node)) {
                 delete (node as any)[prop];
             }
             for (const prop of Object.getOwnPropertyNames(resolved)) {
                 (node as any)[prop] = (resolved as any)[prop];
             }
-            if (wasOptional) {
-                node.isOptional = true;
-            }
             if (wasNullable) {
                 node.isNullable = true;
             }
@@ -618,26 +614,23 @@ export default class CSharpEmitterContext {
         // external union type alias, refer by name
         if (!tsType.symbol && tsType.aliasSymbol) {
             let isNullable = false;
-            let isOptional = false;
             for (let t of tsType.types) {
                 if ((t.flags & ts.TypeFlags.Null) !== 0) {
                     isNullable = true;
                 } else if ((t.flags & ts.TypeFlags.Undefined) !== 0) {
-                    isOptional = true;
+                    isNullable = true;
                 }
             }
 
             return {
                 nodeType: cs.SyntaxKind.TypeReference,
                 parent: parent,
                 reference: this.buildCoreNamespace(tsType.aliasSymbol) + tsType.aliasSymbol.name,
-                isNullable: isNullable,
-                isOptional: isOptional
+                isNullable: isNullable
             } as cs.TypeReference;
         }
 
         let isNullable = false;
-        let isOptional = false;
         let actualType: ts.Type | null = null;
         let fallbackToObject = false;
         for (let t of tsType.types) {
@@ -648,7 +641,7 @@ export default class CSharpEmitterContext {
             if ((t.flags & ts.TypeFlags.Null) !== 0) {
                 isNullable = true;
             } else if ((t.flags & ts.TypeFlags.Undefined) !== 0) {
-                isOptional = true;
+                isNullable = true;
             } else if (actualType == null) {
                 actualType = t;
             } else if (actualType != null && actualType.flags !== t.flags) {
@@ -671,8 +664,7 @@ export default class CSharpEmitterContext {
                 nodeType: cs.SyntaxKind.PrimitiveTypeNode,
                 parent: parent,
                 type: cs.PrimitiveType.Object,
-                isNullable: isNullable,
-                isOptional: isOptional
+                isNullable: isNullable
             } as cs.PrimitiveTypeNode;
         }
 
@@ -686,8 +678,7 @@ export default class CSharpEmitterContext {
                 nodeType: cs.SyntaxKind.TypeReference,
                 parent: parent,
                 reference: tsType.symbol.name,
-                isNullable: isNullable,
-                isOptional: isOptional
+                isNullable: isNullable
             } as cs.TypeReference;
         } else {
             type = this.getTypeFromTsType(parent, actualType, undefined, typeArguments);
@@ -697,8 +688,7 @@ export default class CSharpEmitterContext {
             nodeType: cs.SyntaxKind.TypeReference,
             parent: parent,
             reference: type,
-            isNullable: isNullable,
-            isOptional: isOptional
+            isNullable: isNullable
         } as cs.TypeReference;
     }
 
@@ -725,22 +715,20 @@ export default class CSharpEmitterContext {
     private resolvePrimitiveType(parent: cs.Node, tsType: ts.Type): cs.TypeNode | null {
         const handleNullablePrimitive = (type: cs.PrimitiveType) => {
             let isNullable = false;
-            let isOptional = false;
             if (tsType.isUnion()) {
                 for (const t of tsType.types) {
                     if ((t.flags & ts.TypeFlags.Null) !== 0) {
                         isNullable = true;
                     } else if ((t.flags & ts.TypeFlags.Undefined) !== 0) {
-                        isOptional = true;
+                        isNullable = true;
                     }
                 }
             }
 
             return {
                 nodeType: cs.SyntaxKind.PrimitiveTypeNode,
                 type: type,
-                isNullable: isNullable,
-                isOptional: isOptional
+                isNullable: isNullable
             } as cs.PrimitiveTypeNode;
         };
 

diff --git a/src.compiler/kotlin/KotlinAstPrinter.ts b/src.compiler/kotlin/KotlinAstPrinter.ts
@@ -188,16 +188,16 @@ export default class KotlinAstPrinter extends AstPrinterBase {
         if (p.type) {
             this.write(': ');
             if (p.params) {
-                this.writeType((p.type as cs.ArrayTypeNode).elementType, false, false);
+                this.writeType((p.type as cs.ArrayTypeNode).elementType, false, false, false, true, false);
             } else {
-                this.writeType(p.type, false);
+                this.writeType(p.type, false, false, false, true, false);
             }
         }
         if (!this.isOverrideMethod(p.parent!)) {
             if (p.initializer) {
                 this.write(' = ');
                 this.writeExpression(p.initializer);
-            } else if (p.type && p.type.isOptional) {
+            } else if (p.type && p.isOptional) {
                 let type: cs.TypeNode = p.type;
                 if (cs.isTypeReference(p.type)) {
                     type = p.type.reference as cs.TypeNode;
@@ -582,23 +582,32 @@ export default class KotlinAstPrinter extends AstPrinterBase {
         this.write(': ');
         this.writeType(d.type);
 
+        let initializerWritten = false;
         if (d.initializer && !isLateInit) {
             this.write(' = ');
             this.writeExpression(d.initializer);
+            initializerWritten = true;
             this.writeLine();
         } else if (writeAsField) {
             this.writeLine();
         }
 
-        if (!writeAsField && !isAutoProperty) {
-            this.writeLine();
-
-            if (d.getAccessor) {
-                this.writePropertyAccessor(d.getAccessor);
+        if (!writeAsField) {
+            if(isAutoProperty && d.type.isNullable && !initializerWritten && 
+                d.parent!.nodeType !== cs.SyntaxKind.InterfaceDeclaration
+            ) {
+                this.write(' = null');
             }
+            this.writeLine();
 
-            if (d.setAccessor) {
-                this.writePropertyAccessor(d.setAccessor);
+            if(!isAutoProperty) {
+                if (d.getAccessor) {
+                    this.writePropertyAccessor(d.getAccessor);
+                }
+
+                if (d.setAccessor) {
+                    this.writePropertyAccessor(d.setAccessor);
+                }
             }
         }
     }
@@ -662,7 +671,8 @@ export default class KotlinAstPrinter extends AstPrinterBase {
         forNew: boolean = false,
         asNativeArray: boolean = false,
         forTypeConstraint: boolean = false,
-        allowPromise: boolean = true
+        allowPromise: boolean = true,
+        optionalAsNullable: boolean = true
     ) {
         switch (type.nodeType) {
             case cs.SyntaxKind.PrimitiveTypeNode:
@@ -828,7 +838,7 @@ export default class KotlinAstPrinter extends AstPrinterBase {
                 this.write('TODO: ' + cs.SyntaxKind[type.nodeType]);
                 break;
         }
-        if ((type.isNullable || type.isOptional) && !forNew && !forTypeConstraint) {
+        if ((type.isNullable) && !forNew && !forTypeConstraint) {
             this.write('?');
         }
     }

diff --git a/src.compiler/kotlin/KotlinAstTransformer.ts b/src.compiler/kotlin/KotlinAstTransformer.ts
@@ -310,6 +310,24 @@ export default class KotlinAstTransformer extends CSharpAstTransformer {
         return func;
     }
 
+
+    protected override visitTestClassMethod(parent: cs.ClassDeclaration, d: ts.FunctionDeclaration) {
+        this._paramReferences.push(new Map<string, cs.Identifier[]>());
+        this._paramsWithAssignment.push(new Set<string>());
+
+        const method = super.visitTestClassMethod(parent, d);
+
+        if (method.body && cs.isBlock(method.body)) {
+            this.injectParametersAsLocal(method.body);
+        }
+
+        this._paramReferences.pop();
+        this._paramsWithAssignment.pop();
+
+        return method;
+    }
+
+
     protected override visitMethodDeclaration(
         parent: cs.ClassDeclaration | cs.InterfaceDeclaration,
         classElement: ts.MethodDeclaration

diff --git a/src.csharp/AlphaTab/Platform/CSharp/GdiCanvas.cs b/src.csharp/AlphaTab/Platform/CSharp/GdiCanvas.cs
@@ -1,5 +1,4 @@
 using AlphaTab.Model;
-using AlphaTab.Rendering.Glyphs;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -473,8 +472,7 @@ public TextMetrics MeasureText(string text)
     }
 
     public void FillMusicFontSymbol(double x, double y, double scale, MusicFontSymbol symbol,
-        bool centerAtPosition =
-            false)
+        bool? centerAtPosition = false)
     {
         if (symbol == MusicFontSymbol.None)
         {
@@ -489,13 +487,12 @@ public void FillMusicFontSymbol(double x, double y, double scale, MusicFontSymbo
 
         _graphics.DrawString(String.FromCharCode((int)symbol), GetMusicFont(scale),
             _brush, (float)x, (float)y,
-            centerAtPosition ? MusicFontFormatCenter : MusicFontFormat);
+            centerAtPosition.GetValueOrDefault() ? MusicFontFormatCenter : MusicFontFormat);
     }
 
     public void FillMusicFontSymbols(double x, double y, double scale,
         IList<MusicFontSymbol> symbols,
-        bool centerAtPosition
-            = false)
+        bool? centerAtPosition = false)
     {
         var s = "";
         foreach (var symbol in symbols)
@@ -513,7 +510,7 @@ bool centerAtPosition
         x += scale;
 
         _graphics.DrawString(s, GetMusicFont(scale), _brush, (float)x, (float)y,
-            centerAtPosition ? MusicFontFormatCenter : MusicFontFormat);
+            centerAtPosition.GetValueOrDefault() ? MusicFontFormatCenter : MusicFontFormat);
     }
 
     public void BeginRotate(double centerX, double centerY, double angle)