Fix Kotlin inspections

common/src/main/java/dev/openrs2/common/StringUtils.kt

@@ -3,8 +3,7 @@ package dev.openrs2.common
 fun CharSequence.indefiniteArticle(): String {
     require(isNotEmpty())
 
-    val first = first().toLowerCase()
+    return when (first().toLowerCase()) {
-    return when (first) {
         'a', 'e', 'i', 'o', 'u' -> "an"
         else -> "a"
     }

common/src/main/java/dev/openrs2/common/collect/ForestDisjointSet.kt

@@ -98,13 +98,17 @@ class ForestDisjointSet<T> : DisjointSet<T> {
             return
         }
 
-        if (xRoot.rank < yRoot.rank) {
+        when {
-            xRoot.parent = yRoot
+            xRoot.rank < yRoot.rank -> {
-        } else if (xRoot.rank > yRoot.rank) {
+                xRoot.parent = yRoot
-            yRoot.parent = xRoot
+            }
-        } else {
+            xRoot.rank > yRoot.rank -> {
-            yRoot.parent = xRoot
+                yRoot.parent = xRoot
-            xRoot.rank++
+            }
+            else -> {
+                yRoot.parent = xRoot
+                xRoot.rank++
+            }
         }
 
         partitions--

deob-ast/src/main/java/dev/openrs2/deob/ast/transform/IfElseTransformer.kt

@@ -115,13 +115,13 @@ class IfElseTransformer : Transformer() {
 
     companion object {
         private fun isIf(stmt: Statement): Boolean {
-            return if (stmt.isIfStmt) {
+            return when {
-                true
+                stmt.isIfStmt -> true
-            } else if (stmt.isBlockStmt) {
+                stmt.isBlockStmt -> {
-                val stmts = stmt.asBlockStmt().statements
+                    val stmts = stmt.asBlockStmt().statements
-                stmts.size == 1 && stmts[0].isIfStmt
+                    stmts.size == 1 && stmts[0].isIfStmt
-            } else {
+                }
-                false
+                else -> false
             }
         }
 

deob-ast/src/main/java/dev/openrs2/deob/ast/util/ExprUtils.kt

@@ -12,7 +12,7 @@ fun Expression.isIntegerOrLongLiteral(): Boolean {
 }
 
 fun createLong(value: Long): LongLiteralExpr {
-    return LongLiteralExpr(java.lang.Long.toString(value) + "L")
+    return LongLiteralExpr(value.toString() + "L")
 }
 
 fun Expression.negate(): Expression {

deob/src/main/java/dev/openrs2/deob/transform/OpaquePredicateTransformer.kt

@@ -39,13 +39,13 @@ class OpaquePredicateTransformer : Transformer() {
     }
 
     private fun findFlowObstructors(library: Library, method: MethodNode) {
-        FLOW_OBSTRUCTOR_INITIALIZER_MATCHER.match(method).forEach {
+        FLOW_OBSTRUCTOR_INITIALIZER_MATCHER.match(method).forEach { match ->
             // add flow obstructor to set
-            val putstatic = it.last() as FieldInsnNode
+            val putstatic = match.last() as FieldInsnNode
             flowObstructors.add(MemberRef(putstatic))
 
             // remove initializer
-            it.forEach(method.instructions::remove)
+            match.forEach(method.instructions::remove)
 
             // remove field
             val owner = library[putstatic.owner]!!

deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.kt

@@ -56,8 +56,7 @@ class UnusedArgTransformer : Transformer() {
 
             val stackSize = frame.stackSize
 
-            val insn = method.instructions[i]
+            when (val insn = method.instructions[i]) {
-            when (insn) {
                 is VarInsnNode -> {
                     if (insn.opcode != Opcodes.ILOAD) {
                         continue@frame