From ba34428e95ca67e1373853be6e590d5ed4cf1eb9 Mon Sep 17 00:00:00 2001 From: Phodal Huang Date: Sun, 16 Jun 2024 15:53:42 +0800 Subject: [PATCH] fix(java): handle null psiElement in resolveVariableValue Updated JavaPsiContextVariableProvider to handle null psiElement in resolveVariableValue method. --- .../shirelang/java/impl/JavaPsiContextVariableProvider.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/java/src/main/kotlin/com/phodal/shirelang/java/impl/JavaPsiContextVariableProvider.kt b/languages/java/src/main/kotlin/com/phodal/shirelang/java/impl/JavaPsiContextVariableProvider.kt index 326cf15fd..eb99951c8 100644 --- a/languages/java/src/main/kotlin/com/phodal/shirelang/java/impl/JavaPsiContextVariableProvider.kt +++ b/languages/java/src/main/kotlin/com/phodal/shirelang/java/impl/JavaPsiContextVariableProvider.kt @@ -11,8 +11,8 @@ import com.phodal.shirecore.provider.PsiContextVariableProvider import com.phodal.shirelang.java.toolchain.getContainingClass class JavaPsiContextVariableProvider : PsiContextVariableProvider { - override fun resolveVariableValue(psiElement: PsiElement, variable: PsiVariable): String { - val project = psiElement.project + override fun resolveVariableValue(psiElement: PsiElement?, variable: PsiVariable): String { + val project = psiElement?.project ?: return "" if (psiElement.language.id != "JAVA") { return "" }