fix: Live log variables not working in Kotlin

ref: sourceplusplus/sourceplusplus#786

Author: BFergerson

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactScopeService.kt

@@ -31,16 +31,11 @@ import com.intellij.psi.scope.processor.VariablesProcessor
 import com.intellij.psi.scope.util.PsiScopesUtil
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.searches.ReferencesSearch
-import com.intellij.psi.util.descendantsOfType
-import com.intellij.psi.util.findParentOfType
-import com.intellij.psi.util.parentOfType
-import com.intellij.psi.util.parentOfTypes
+import com.intellij.psi.util.*
 import com.siyeh.ig.psiutils.ControlFlowUtils
 import org.jetbrains.kotlin.backend.jvm.ir.psiElement
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
-import org.jetbrains.kotlin.psi.KtCallExpression
-import org.jetbrains.kotlin.psi.KtIfExpression
-import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrCall
 import org.joor.Reflect
 import spp.jetbrains.artifact.service.ArtifactTypeService
@@ -138,19 +133,41 @@ class JVMArtifactScopeService : IArtifactScopeService {
     }
 
     override fun getScopeVariables(file: PsiFile, lineNumber: Int): List<String> {
-        //determine available vars
+        //skip blank lines (if present) till valid minimum scope
         var checkLine = lineNumber
-        val scopeVars = mutableListOf<String>()
         var minScope: PsiElement? = null
         while (minScope == null) {
             minScope = SourceMarkerUtils.getElementAtLine(file, --checkLine)
         }
-        val variablesProcessor: VariablesProcessor = object : VariablesProcessor(false) {
-            override fun check(`var`: PsiVariable, state: ResolveState): Boolean = true
+
+        return if (file is KtFile) {
+            getScopeVariables(minScope)
+        } else {
+            val scopeVars = mutableListOf<String>()
+            val variablesProcessor: VariablesProcessor = object : VariablesProcessor(false) {
+                override fun check(`var`: PsiVariable, state: ResolveState): Boolean = true
+            }
+            PsiScopesUtil.treeWalkUp(variablesProcessor, minScope, null)
+            for (i in 0 until variablesProcessor.size()) {
+                scopeVars.add(variablesProcessor.getResult(i).name!!)
+            }
+            scopeVars
         }
-        PsiScopesUtil.treeWalkUp(variablesProcessor, minScope, null)
-        for (i in 0 until variablesProcessor.size()) {
-            scopeVars.add(variablesProcessor.getResult(i).name!!)
+    }
+
+    private fun getScopeVariables(minScope: PsiElement): List<String> {
+        val scopeVars = mutableListOf<String>()
+        minScope.parents(true).filterIsInstance<KtBlockExpression>().forEach {
+            it.statements.filterIsInstance<KtProperty>().forEach {
+                if (it.textRange.startOffset <= minScope.textRange.startOffset) {
+                    it.name?.let { scopeVars.add(it) }
+                }
+            }
+        }
+        minScope.parents(true).filterIsInstance<KtCatchClause>().forEach {
+            it.parameterList?.parameters?.forEach {
+                it.name?.let { scopeVars.add(it) }
+            }
         }
         return scopeVars
     }

marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/service/JVMVariableScopeTest.kt

@@ -0,0 +1,61 @@
+/*
+ * Source++, the continuous feedback platform for developers.
+ * Copyright (C) 2022-2023 CodeBrig, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package spp.jetbrains.marker.jvm.service
+
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.util.Computable
+import com.intellij.testFramework.TestDataPath
+import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import kotlinx.coroutines.runBlocking
+import spp.jetbrains.artifact.service.ArtifactScopeService
+import spp.jetbrains.marker.SourceMarker
+import spp.jetbrains.marker.jvm.JVMLanguageProvider
+
+@TestDataPath("\$CONTENT_ROOT/testData/scope/")
+class JVMVariableScopeTest : BasePlatformTestCase() {
+
+    override fun setUp() {
+        super.setUp()
+        ApplicationManager.getApplication().runReadAction(Computable {
+            runBlocking {
+                SourceMarker.getInstance(myFixture.project).clearAvailableSourceFileMarkers()
+            }
+        })
+
+        JVMLanguageProvider().setup(project)
+    }
+
+    override fun getTestDataPath(): String {
+        return "src/test/testData/scope/"
+    }
+
+    fun testVariableScope() {
+        doVariableScope("groovy")
+        doVariableScope("java")
+        doVariableScope("kt")
+    }
+
+    private fun doVariableScope(extension: String) {
+        val psiFile = myFixture.configureByFile(getTestName(false) + ".$extension")
+        val scopeVariables = ArtifactScopeService.getScopeVariables(psiFile, 7)
+        assertEquals(4, scopeVariables.size)
+        assertTrue(scopeVariables.any { it == "i" })
+        assertTrue(scopeVariables.any { it == "c" })
+        assertTrue(scopeVariables.any { it == "s" })
+        assertTrue(scopeVariables.any { it == "f" })
+    }
+}

marker/jvm-marker/src/test/testData/scope/VariableScope.groovy

@@ -0,0 +1,8 @@
+class VariableScope {
+    private void variableScope() {
+        def i = 1
+        def c = 'h'
+        def s = "hi"
+        def f = 1.0f
+    }
+}

marker/jvm-marker/src/test/testData/scope/VariableScope.java

@@ -0,0 +1,8 @@
+private class VariableScope {
+    private void variableScope() {
+        int i = 1;
+        char c = 'h';
+        String s = "hi";
+        float f = 1.0f;
+    }
+}

marker/jvm-marker/src/test/testData/scope/VariableScope.kt

@@ -0,0 +1,8 @@
+private class VariableScope {
+    private fun variableScope() {
+        val i = 1
+        val c = 'h'
+        val s = "hi"
+        val f = 1.0f
+    }
+}