From 4eb7c06dbf47b77c1060edb4789cb712f063794c Mon Sep 17 00:00:00 2001
From: Alexey Menshutin <alex.menshutin99@gmail.com>
Date: Tue, 23 Jul 2024 12:08:09 +0300
Subject: [PATCH] Detekt fixes

---
 usvm-ts/src/main/kotlin/org/usvm/TSComponents.kt         | 4 ++--
 usvm-ts/src/main/kotlin/org/usvm/TSContext.kt            | 4 +---
 usvm-ts/src/main/kotlin/org/usvm/TSInterpreter.kt        | 2 +-
 usvm-ts/src/main/kotlin/org/usvm/TSTarget.kt             | 3 +--
 usvm-ts/src/main/kotlin/org/usvm/TSTest.kt               | 4 ++--
 usvm-ts/src/main/kotlin/org/usvm/TSTypeSystem.kt         | 2 +-
 usvm-ts/src/main/kotlin/org/usvm/state/TSState.kt        | 9 ++++++++-
 .../src/test/kotlin/org/usvm/util/TSMethodTestRunner.kt  | 3 +--
 8 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/usvm-ts/src/main/kotlin/org/usvm/TSComponents.kt b/usvm-ts/src/main/kotlin/org/usvm/TSComponents.kt
index f0b1cab323..15671ef2c2 100644
--- a/usvm-ts/src/main/kotlin/org/usvm/TSComponents.kt
+++ b/usvm-ts/src/main/kotlin/org/usvm/TSComponents.kt
@@ -10,7 +10,7 @@ import org.usvm.types.UTypeSystem
 
 class TSComponents(
     private val typeSystem: TSTypeSystem,
-    private val options: UMachineOptions
+    private val options: UMachineOptions,
 ) : UComponents<EtsType, TSSizeSort> {
     private val closeableResources = mutableListOf<AutoCloseable>()
 
@@ -22,7 +22,7 @@ class TSComponents(
     }
 
     override fun mkTypeSystem(
-        ctx: UContext<TSSizeSort>
+        ctx: UContext<TSSizeSort>,
     ): UTypeSystem<EtsType> = typeSystem
 
     override fun <Context : UContext<TSSizeSort>> mkSolver(ctx: Context): USolverBase<EtsType> {
diff --git a/usvm-ts/src/main/kotlin/org/usvm/TSContext.kt b/usvm-ts/src/main/kotlin/org/usvm/TSContext.kt
index 26269b4793..8e6660bdb4 100644
--- a/usvm-ts/src/main/kotlin/org/usvm/TSContext.kt
+++ b/usvm-ts/src/main/kotlin/org/usvm/TSContext.kt
@@ -2,6 +2,4 @@ package org.usvm
 
 typealias TSSizeSort = UBv32Sort
 
-class TSContext(components: TSComponents) : UContext<TSSizeSort>(components) {
-
-}
+class TSContext(components: TSComponents) : UContext<TSSizeSort>(components)
diff --git a/usvm-ts/src/main/kotlin/org/usvm/TSInterpreter.kt b/usvm-ts/src/main/kotlin/org/usvm/TSInterpreter.kt
index 66a241b5b3..d514bbb2ef 100644
--- a/usvm-ts/src/main/kotlin/org/usvm/TSInterpreter.kt
+++ b/usvm-ts/src/main/kotlin/org/usvm/TSInterpreter.kt
@@ -14,7 +14,7 @@ import org.usvm.targets.UTargetsSet
 
 class TSInterpreter(
     private val ctx: TSContext,
-    private val applicationGraph: TSApplicationGraph
+    private val applicationGraph: TSApplicationGraph,
 ) : UInterpreter<TSState>() {
     private val forkBlackList: UForkBlackList<TSState, EtsStmt> = UForkBlackList.createDefault()
 
diff --git a/usvm-ts/src/main/kotlin/org/usvm/TSTarget.kt b/usvm-ts/src/main/kotlin/org/usvm/TSTarget.kt
index d47255e6f2..4b728f6c74 100644
--- a/usvm-ts/src/main/kotlin/org/usvm/TSTarget.kt
+++ b/usvm-ts/src/main/kotlin/org/usvm/TSTarget.kt
@@ -3,5 +3,4 @@ package org.usvm
 import org.jacodb.ets.base.EtsStmt
 import org.usvm.targets.UTarget
 
-class TSTarget : UTarget<EtsStmt, TSTarget>() {
-}
+class TSTarget : UTarget<EtsStmt, TSTarget>()
diff --git a/usvm-ts/src/main/kotlin/org/usvm/TSTest.kt b/usvm-ts/src/main/kotlin/org/usvm/TSTest.kt
index 4b994ca1a0..16a2ac28c1 100644
--- a/usvm-ts/src/main/kotlin/org/usvm/TSTest.kt
+++ b/usvm-ts/src/main/kotlin/org/usvm/TSTest.kt
@@ -5,7 +5,7 @@ import org.jacodb.ets.base.EtsStmt
 class TSTest(
     val parameters: List<Any>,
     val resultValue: Any?,
-    val trace: List<EtsStmt>? = null
+    val trace: List<EtsStmt>? = null,
 )
 
-class TSMethodCoverage
\ No newline at end of file
+class TSMethodCoverage
diff --git a/usvm-ts/src/main/kotlin/org/usvm/TSTypeSystem.kt b/usvm-ts/src/main/kotlin/org/usvm/TSTypeSystem.kt
index cbf9748444..aa2ccfc21b 100644
--- a/usvm-ts/src/main/kotlin/org/usvm/TSTypeSystem.kt
+++ b/usvm-ts/src/main/kotlin/org/usvm/TSTypeSystem.kt
@@ -8,7 +8,7 @@ import kotlin.time.Duration
 
 class TSTypeSystem(
     override val typeOperationsTimeout: Duration,
-    val project: EtsFile
+    val project: EtsFile,
 ) : UTypeSystem<EtsType> {
     override fun isSupertype(supertype: EtsType, type: EtsType): Boolean {
         TODO("Not yet implemented")
diff --git a/usvm-ts/src/main/kotlin/org/usvm/state/TSState.kt b/usvm-ts/src/main/kotlin/org/usvm/state/TSState.kt
index 519422b531..d22857a653 100644
--- a/usvm-ts/src/main/kotlin/org/usvm/state/TSState.kt
+++ b/usvm-ts/src/main/kotlin/org/usvm/state/TSState.kt
@@ -25,7 +25,14 @@ class TSState(
     var methodResult: TSMethodResult = TSMethodResult.NoCall,
     targets: UTargetsSet<TSTarget, EtsStmt> = UTargetsSet.empty(),
 ) : UState<EtsType, EtsMethod, EtsStmt, TSContext, TSTarget, TSState>(
-    ctx, callStack, pathConstraints, memory, models, pathNode, forkPoints, targets
+    ctx,
+    callStack,
+    pathConstraints,
+    memory,
+    models,
+    pathNode,
+    forkPoints,
+    targets
 ) {
     override fun clone(newConstraints: UPathConstraints<EtsType>?): TSState {
         val clonedConstraints = newConstraints ?: pathConstraints.clone()
diff --git a/usvm-ts/src/test/kotlin/org/usvm/util/TSMethodTestRunner.kt b/usvm-ts/src/test/kotlin/org/usvm/util/TSMethodTestRunner.kt
index 03da7ee23a..56944aafcb 100644
--- a/usvm-ts/src/test/kotlin/org/usvm/util/TSMethodTestRunner.kt
+++ b/usvm-ts/src/test/kotlin/org/usvm/util/TSMethodTestRunner.kt
@@ -126,7 +126,7 @@ open class TSMethodTestRunner : TestRunner<TSTest, MethodDescriptor, EtsType?, T
         get() = TODO("Not yet implemented")
 
     private fun getProject(fileName: String): EtsFile {
-        val jsonWithoutExtension = "/ir/${fileName}.json"
+        val jsonWithoutExtension = "/ir/$fileName.json"
         val sampleFilePath = javaClass.getResourceAsStream(jsonWithoutExtension)
             ?: error("Resource not found: $jsonWithoutExtension")
 
@@ -141,7 +141,6 @@ open class TSMethodTestRunner : TestRunner<TSTest, MethodDescriptor, EtsType?, T
 
         return cls.methods.find { it.name == desc.methodName && it.parameters.size == desc.argumentsNumber }
             ?: error("No method matching $desc found in $name")
-
     }
 
     override val runner: (MethodDescriptor, UMachineOptions) -> List<TSTest>