Fix constructor call

Author: Lipen

jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/ConvertToEts.kt

@@ -127,6 +127,23 @@ import org.jacodb.ets.model.EtsUnsignedRightShiftExpr
 import org.jacodb.ets.model.EtsValue
 import org.jacodb.ets.model.EtsVoidType
 import org.jacodb.ets.model.EtsYieldExpr
+import org.jacodb.ets.utils.CONSTRUCTOR_NAME
+
+/**
+ * Ad-hoc fix for constructor call.
+ *
+ * Replaces `x := x.constructor(...)` with `x.constructor(...)` call stmt.
+ */
+fun EtsAssignStmt.fixConstructorCall(): EtsStmt =
+    if (lhv is EtsLocal &&
+        rhv is EtsInstanceCallExpr &&
+        rhv.instance == lhv &&
+        rhv.callee.name == CONSTRUCTOR_NAME
+    ) {
+        EtsCallStmt(location, rhv)
+    } else {
+        this
+    }
 
 class EtsMethodBuilder(
     signature: EtsMethodSignature,
@@ -209,7 +226,7 @@ class EtsMethodBuilder(
                 location = loc(),
                 lhv = lhv,
                 rhv = rhv,
-            )
+            ).fixConstructorCall()
         }
 
         is CallStmtDto -> {