Improve simple expressions detection for local variable deletion

waleedyaseen · Apr 15, 2024 · aa989c0 · aa989c0
1 parent a4253df
commit aa989c0
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/kotlin/io/runescript/plugin/ide/inspections/fixes/RsDeleteLocalVariableFix.kt b/src/main/kotlin/io/runescript/plugin/ide/inspections/fixes/RsDeleteLocalVariableFix.kt
@@ -24,13 +24,19 @@ class RsDeleteLocalVariableFix : LocalQuickFix {
 }
 
 private fun RsExpression.isSimpleToRemove(): Boolean {
+    if (this is RsStringLiteralExpression) {
+       return stringLiteralContent.stringInterpolationExpressionList.all { it.isSimpleToRemove() }
+    }
     return when (this) {
         is RsNullLiteralExpression,
         is RsIntegerLiteralExpression,
         is RsCoordLiteralExpression,
         is RsBooleanLiteralExpression,
-        is RsLongLiteralExpression -> true
-
+        is RsLongLiteralExpression,
+        is RsLocalVariableExpression,
+        is RsConstantExpression,
+        is RsArrayAccessExpression -> true
+        is RsStringInterpolationExpression -> expression.isSimpleToRemove()
         is RsParExpression -> expression.isSimpleToRemove()
         is RsCalcExpression -> expression.isSimpleToRemove()
         is RsBinaryExpression -> left.isSimpleToRemove() && right.isSimpleToRemove()