Cleanup

Author: Lipen

usvm-ts/src/main/kotlin/org/usvm/machine/expr/WriteLocal.kt

@@ -17,7 +17,7 @@ internal fun TsExprResolver.handleAssignToLocal(
     return assignToLocal(scope, local, expr)
 }
 
-internal fun TsContext. assignToLocal(
+internal fun TsContext.assignToLocal(
     scope: TsStepScope,
     local: EtsLocal,
     expr: UExpr<*>,

usvm-ts/src/main/kotlin/org/usvm/machine/state/TsMethodResult.kt

@@ -4,7 +4,6 @@ import org.jacodb.ets.model.EtsMethod
 import org.jacodb.ets.model.EtsMethodSignature
 import org.jacodb.ets.model.EtsType
 import org.usvm.UExpr
-import org.usvm.UHeapRef
 
 /**
  * Represents a result of a method invocation.

usvm-ts/src/main/kotlin/org/usvm/machine/state/TsStateUtils.kt

@@ -2,7 +2,6 @@ package org.usvm.machine.state
 
 import org.jacodb.ets.model.EtsMethod
 import org.jacodb.ets.model.EtsStmt
-import org.jacodb.ets.utils.getDeclaredLocals
 import org.usvm.UExpr
 import org.usvm.USort
 

usvm-ts/src/main/kotlin/org/usvm/machine/types/TsTypeSystem.kt

@@ -250,8 +250,7 @@ class TsTypeSystem(
     }
 
     override fun isInstantiable(type: EtsType): Boolean {
-        val t = unwrapAlias(type)
-        return when (t) {
+        return when (val t = unwrapAlias(type)) {
             is EtsNeverType -> false  // no runtime value
             is EtsAnyType,
             is EtsUnknownType,
@@ -272,8 +271,7 @@ class TsTypeSystem(
     }
 
     override fun findSubtypes(type: EtsType): Sequence<EtsType> {
-        val t = unwrapAlias(type)
-        return when (t) {
+        return when (val t = unwrapAlias(type)) {
             is EtsPrimitiveType -> emptySequence()
             is EtsAnyType,
             is EtsUnknownType,

usvm-ts/src/main/kotlin/org/usvm/util/EtsFieldResolver.kt

@@ -35,8 +35,7 @@ fun TsContext.resolveEtsField(
 
     // Unknown signature:
     if (instance != null) {
-        val instanceType = instance.type
-        when (instanceType) {
+        when (val instanceType = instance.type) {
             is EtsClassType -> {
                 val field = tryGetSingleField(scene, instanceType.signature.name, field.name, hierarchy)
                 if (field != null) return TsResolutionResult.create(field)