Skip to content

Commit 1c145c2

Browse files
committed
refactor(223-shire): update file retrieval method in VariableTemplateCompiler and ShireVariableTemplateCompiler #379
1 parent 227af8a commit 1c145c2

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

core/src/main/kotlin/cc/unitmesh/devti/custom/compile/VariableTemplateCompiler.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import com.intellij.psi.PsiNameIdentifierOwner
1717
import cc.unitmesh.devti.intentions.action.getElementToAction
1818
import com.intellij.openapi.application.ReadAction
1919
import com.intellij.openapi.application.runReadAction
20+
import com.intellij.openapi.fileEditor.FileDocumentManager
2021
import com.intellij.psi.PsiManager
2122
import kotlinx.coroutines.runBlocking
2223
import org.apache.velocity.VelocityContext
@@ -137,7 +138,7 @@ class VariableTemplateCompiler(
137138
ReadAction.compute<PsiElement?, Throwable> {
138139
currentEditor?.caretModel?.currentCaret?.offset?.let {
139140
val psiFile = currentEditor.let { editor ->
140-
val psiFile = editor.virtualFile?.let { file ->
141+
val psiFile = FileDocumentManager.getInstance().getFile(editor.document)?.let { file ->
141142
PsiManager.getInstance(myProject).findFile(file)
142143
}
143144

exts/devins-lang/src/main/kotlin/cc/unitmesh/devti/language/ast/variable/ShireVariableTemplateCompiler.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import cc.unitmesh.devti.language.ast.variable.resolver.CompositeVariableResolve
77
import cc.unitmesh.devti.language.ast.variable.resolver.base.VariableResolverContext
88
import com.intellij.openapi.application.runReadAction
99
import com.intellij.openapi.editor.Editor
10+
import com.intellij.openapi.fileEditor.FileDocumentManager
1011
import com.intellij.openapi.project.Project
1112
import com.intellij.psi.PsiManager
1213

@@ -42,7 +43,7 @@ class ShireVariableTemplateCompiler(
4243
compiledVariables = additionalMap.mapValues { it.value.toString() }
4344

4445
val file = runReadAction {
45-
PsiManager.getInstance(myProject).findFile(editor.virtualFile ?: return@runReadAction null)
46+
PsiManager.getInstance(myProject).findFile(FileDocumentManager.getInstance().getFile(editor.document) ?: return@runReadAction null)
4647
}!!
4748

4849
val templateCompiler = runReadAction { VariableTemplateCompiler(file.language, file, null, editor) }

0 commit comments

Comments
 (0)