Create PsiKtFileFactory, update KtFile usages

egorikftp · egorikftp · commit bcfdc7b2d6a1 · 2025-12-19T13:50:39.000+03:00
diff --git a/sdk/intellij/psi/iconpack/api/iconpack.api b/sdk/intellij/psi/iconpack/api/iconpack.api
@@ -13,7 +13,6 @@ public final class io/github/composegears/valkyrie/sdk/intellij/psi/iconpack/Ico
 
 public final class io/github/composegears/valkyrie/sdk/intellij/psi/iconpack/IconPackPsiParser {
 	public static final field INSTANCE Lio/github/composegears/valkyrie/sdk/intellij/psi/iconpack/IconPackPsiParser;
-	public final fun extractIconPack (Ljava/nio/file/Path;Lcom/intellij/openapi/project/Project;)Lio/github/composegears/valkyrie/sdk/intellij/psi/iconpack/IconPackInfo;
 	public final fun parse (Lorg/jetbrains/kotlin/psi/KtFile;)Lio/github/composegears/valkyrie/sdk/intellij/psi/iconpack/IconPackInfo;
 }
 
diff --git a/sdk/intellij/psi/iconpack/build.gradle.kts b/sdk/intellij/psi/iconpack/build.gradle.kts
@@ -8,7 +8,6 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.sdk.core.extensions)
     implementation(projects.components.generator.core)
 
     testImplementation(testFixtures(projects.sdk.intellij.testFixtures))
diff --git a/sdk/intellij/psi/iconpack/src/main/kotlin/io/github/composegears/valkyrie/sdk/intellij/psi/iconpack/IconPackPsiParser.kt b/sdk/intellij/psi/iconpack/src/main/kotlin/io/github/composegears/valkyrie/sdk/intellij/psi/iconpack/IconPackPsiParser.kt
@@ -1,14 +1,6 @@
 package io.github.composegears.valkyrie.sdk.intellij.psi.iconpack
 
-import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiManager
-import com.intellij.testFramework.LightVirtualFile
 import io.github.composegears.valkyrie.generator.core.IconPack
-import io.github.composegears.valkyrie.sdk.core.extensions.safeAs
-import java.nio.file.Path
-import kotlin.io.path.name
-import kotlin.io.path.readText
-import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtObjectDeclaration
 
@@ -47,13 +39,4 @@ object IconPackPsiParser {
             nested = nestedObjects,
         )
     }
-
-    @Deprecated("Use ktFile version instead")
-    fun extractIconPack(path: Path, project: Project): IconPackInfo? {
-        val ktFile = PsiManager.getInstance(project)
-            .findFile(LightVirtualFile(path.name, KotlinFileType.INSTANCE, path.readText()))
-            .safeAs<KtFile>() ?: return null
-
-        return parse(ktFile)
-    }
 }
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/editor/VirtualFile.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/editor/VirtualFile.kt
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/editor/ui/VirtualFileImageVector.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/editor/ui/VirtualFileImageVector.kt
@@ -14,12 +14,12 @@ import com.composegears.leviathan.compose.inject
 import com.intellij.openapi.application.readAction
 import com.intellij.openapi.vfs.VirtualFile
 import io.github.composegears.valkyrie.compose.core.rememberMutableState
-import io.github.composegears.valkyrie.editor.toKtFile
 import io.github.composegears.valkyrie.psi.imagevector.ImageVectorPsiParser
 import io.github.composegears.valkyrie.sdk.ir.core.IrImageVector
 import io.github.composegears.valkyrie.ui.di.DI
 import io.github.composegears.valkyrie.ui.foundation.components.previewer.ImageVectorPreviewPanel
 import io.github.composegears.valkyrie.ui.foundation.compositionlocal.LocalProject
+import io.github.composegears.valkyrie.util.extension.resolveKtFile
 import org.jetbrains.kotlin.psi.KtFile
 
 @Composable
@@ -35,7 +35,7 @@ fun VirtualFileImageVector(
 
     val ktFile by produceState<KtFile?>(null) {
         value = readAction {
-            file.toKtFile(project.current)
+            file.resolveKtFile(project.current)
         }
     }
 
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/platform/picker/FilePicker.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/platform/picker/FilePicker.kt
@@ -17,7 +17,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 @Composable
-fun rememberKtFilePicker(): Picker<Path?> {
+fun rememberKtPathPicker(): Picker<Path?> {
     if (LocalInspectionMode.current) return StubFilePicker
 
     val project = LocalProject.current
@@ -31,7 +31,7 @@ fun rememberKtFilePicker(): Picker<Path?> {
 }
 
 @Composable
-fun rememberFilePicker(): Picker<Path?> {
+fun rememberSvgXmlPathPicker(): Picker<Path?> {
     if (LocalInspectionMode.current) return StubFilePicker
 
     val project = LocalProject.current
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/existingpack/ui/foundation/ChooseExistingPackFile.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/existingpack/ui/foundation/ChooseExistingPackFile.kt
@@ -21,7 +21,7 @@ import io.github.composegears.valkyrie.ui.foundation.TextWithIcon
 import io.github.composegears.valkyrie.ui.foundation.compositionlocal.LocalProject
 import io.github.composegears.valkyrie.ui.foundation.icons.KotlinLogo
 import io.github.composegears.valkyrie.ui.foundation.theme.PreviewTheme
-import io.github.composegears.valkyrie.ui.platform.picker.rememberKtFilePicker
+import io.github.composegears.valkyrie.ui.platform.picker.rememberKtPathPicker
 import io.github.composegears.valkyrie.ui.platform.rememberFileDragAndDropHandler
 import io.github.composegears.valkyrie.ui.screen.mode.iconpack.existingpack.ui.model.ExistingPackAction
 import kotlin.io.path.isRegularFile
@@ -49,7 +49,7 @@ fun ChooseExistingPackFile(
     val isDragging by rememberMutableState(dragAndDropHandler.isDragging) { dragAndDropHandler.isDragging }
 
     val scope = rememberCoroutineScope()
-    val ktFilePicker = rememberKtFilePicker()
+    val ktPathPicker = rememberKtPathPicker()
 
     Column(modifier = modifier) {
         DragAndDropBox(
@@ -59,7 +59,7 @@ fun ChooseExistingPackFile(
             isDragging = isDragging,
             onChoose = {
                 scope.launch {
-                    val path = ktFilePicker.launch()
+                    val path = ktPathPicker.launch()
 
                     if (path != null) {
                         onAction(
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/existingpack/ui/viewmodel/ExistingPackViewModel.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/existingpack/ui/viewmodel/ExistingPackViewModel.kt
@@ -30,6 +30,7 @@ import io.github.composegears.valkyrie.ui.screen.mode.iconpack.existingpack.ui.m
 import io.github.composegears.valkyrie.ui.screen.mode.iconpack.existingpack.ui.model.ExistingPackModeState
 import io.github.composegears.valkyrie.ui.screen.mode.iconpack.existingpack.ui.model.ExistingPackModeState.ChooserState
 import io.github.composegears.valkyrie.ui.screen.mode.iconpack.existingpack.ui.model.ExistingPackModeState.ExistingPackEditState
+import io.github.composegears.valkyrie.util.extension.resolveKtFile
 import java.nio.file.Path
 import kotlin.io.path.absolutePathString
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -84,8 +85,9 @@ class ExistingPackViewModel : ViewModel() {
         }
     }
 
-    private fun onChooseFile(path: Path, project: Project) {
-        val iconPackInfo = IconPackPsiParser.extractIconPack(path, project) ?: return
+    private fun onChooseFile(path: Path, project: Project) = viewModelScope.launch {
+        val ktFile = path.resolveKtFile(project) ?: return@launch
+        val iconPackInfo = IconPackPsiParser.parse(ktFile) ?: return@launch
 
         val inputFieldState = iconPackInfo.toInputFieldState()
         inputHandler.updateState(inputFieldState)
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/imagevectortoxml/conversion/ImageVectorToXmlViewModel.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/imagevectortoxml/conversion/ImageVectorToXmlViewModel.kt
@@ -7,23 +7,20 @@ import com.composegears.tiamat.navigation.asStateFlow
 import com.composegears.tiamat.navigation.recordOf
 import com.intellij.openapi.application.readAction
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.vfs.VfsUtil
-import com.intellij.psi.PsiFileFactory
-import io.github.composegears.valkyrie.editor.toKtFile
 import io.github.composegears.valkyrie.psi.imagevector.ImageVectorPsiParser
-import io.github.composegears.valkyrie.sdk.core.extensions.safeAs
 import io.github.composegears.valkyrie.sdk.ir.xml.toVectorXmlString
 import io.github.composegears.valkyrie.ui.screen.mode.imagevectortoxml.conversion.model.ImageVectorSource
 import io.github.composegears.valkyrie.ui.screen.mode.imagevectortoxml.conversion.model.ImageVectorToXmlParams
 import io.github.composegears.valkyrie.ui.screen.mode.imagevectortoxml.conversion.model.ImageVectorToXmlState
 import io.github.composegears.valkyrie.ui.screen.mode.imagevectortoxml.conversion.model.XmlContent
+import io.github.composegears.valkyrie.util.extension.PsiKtFileFactory
+import io.github.composegears.valkyrie.util.extension.resolveKtFile
 import java.nio.file.Path
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.psi.KtFile
 
 class ImageVectorToXmlViewModel(
@@ -49,10 +46,7 @@ class ImageVectorToXmlViewModel(
     }
 
     private fun convertFromPath(path: Path) = viewModelScope.launch(Dispatchers.IO) {
-        val ktFile = readAction {
-            val virtualFile = VfsUtil.findFile(path, true)
-            virtualFile?.toKtFile(project)
-        }
+        val ktFile = path.resolveKtFile(project)
 
         if (ktFile == null) {
             _events.emit("Failed to read Kotlin file")
@@ -72,13 +66,11 @@ class ImageVectorToXmlViewModel(
     }
 
     private fun convertFromText(kotlinCode: String) = viewModelScope.launch(Dispatchers.IO) {
-        val ktFile = withContext(Dispatchers.Default) {
-            readAction {
-                PsiFileFactory.getInstance(project)
-                    .createFileFromText("ImageVector.kt", KotlinFileType.INSTANCE, kotlinCode)
-                    .safeAs<KtFile>()
-            }
-        }
+        val ktFile = PsiKtFileFactory.createFromText(
+            project = project,
+            name = "ImageVector.kt",
+            text = kotlinCode,
+        )
 
         if (ktFile == null) {
             _events.emit("Failed to parse Kotlin code")
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/imagevectortoxml/picker/ImageVectorPickerScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/imagevectortoxml/picker/ImageVectorPickerScreen.kt
@@ -8,7 +8,7 @@ import com.composegears.tiamat.compose.navController
 import com.composegears.tiamat.compose.navDestination
 import com.composegears.tiamat.compose.navigate
 import io.github.composegears.valkyrie.ui.foundation.picker.GenericPickerScreen
-import io.github.composegears.valkyrie.ui.platform.picker.rememberKtFilePicker
+import io.github.composegears.valkyrie.ui.platform.picker.rememberKtPathPicker
 import io.github.composegears.valkyrie.ui.screen.mode.imagevectortoxml.conversion.ImageVectorToXmlScreen
 import io.github.composegears.valkyrie.ui.screen.mode.imagevectortoxml.picker.model.ImageVectorPickerAction
 import io.github.composegears.valkyrie.ui.screen.mode.imagevectortoxml.picker.model.ImageVectorPickerEvent
@@ -19,7 +19,7 @@ import kotlinx.coroutines.launch
 val ImageVectorPickerScreen by navDestination {
     val navController = navController()
     val coroutineScope = rememberCoroutineScope()
-    val filePicker = rememberKtFilePicker()
+    val filePicker = rememberKtPathPicker()
 
     val viewModel = viewModel { ImageVectorPickerViewModel() }
 
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/simple/picker/SimplePickerScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/simple/picker/SimplePickerScreen.kt
@@ -8,7 +8,7 @@ import com.composegears.tiamat.compose.navController
 import com.composegears.tiamat.compose.navDestination
 import com.composegears.tiamat.compose.navigate
 import io.github.composegears.valkyrie.ui.foundation.picker.GenericPickerScreen
-import io.github.composegears.valkyrie.ui.platform.picker.rememberFilePicker
+import io.github.composegears.valkyrie.ui.platform.picker.rememberSvgXmlPathPicker
 import io.github.composegears.valkyrie.ui.screen.mode.simple.conversion.SimpleConversionScreen
 import io.github.composegears.valkyrie.ui.screen.mode.simple.picker.model.SimplePickerAction.OnDragAndDropPath
 import io.github.composegears.valkyrie.ui.screen.mode.simple.picker.model.SimplePickerAction.OnPasteFromClipboard
@@ -19,7 +19,7 @@ import kotlinx.coroutines.launch
 val SimplePickerScreen by navDestination {
     val navController = navController()
     val coroutineScope = rememberCoroutineScope()
-    val filePicker = rememberFilePicker()
+    val svgXmlPicker = rememberSvgXmlPathPicker()
 
     val viewModel = viewModel { SimplePickerViewModel() }
 
@@ -49,7 +49,7 @@ val SimplePickerScreen by navDestination {
         },
         onBrowseClick = {
             coroutineScope.launch {
-                filePicker.launch()?.let { path ->
+                svgXmlPicker.launch()?.let { path ->
                     viewModel.onAction(OnDragAndDropPath(path))
                 }
             }
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/util/extension/PsiKtFileFactory.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/util/extension/PsiKtFileFactory.kt
@@ -0,0 +1,26 @@
+package io.github.composegears.valkyrie.util.extension
+
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiFileFactory
+import io.github.composegears.valkyrie.sdk.core.extensions.safeAs
+import org.jetbrains.kotlin.idea.KotlinFileType
+import org.jetbrains.kotlin.psi.KtFile
+
+object PsiKtFileFactory {
+
+    /**
+     * Creates a temporary [KtFile] from the given text.
+     *
+     * This method is thread-safe and can be called from any thread (EDT, background, etc.).
+     * It creates an in-memory PSI structure without modifying the project or filesystem.
+     *
+     * Reading PSI from the created file (e.g., analyzing structure, traversing elements) is also
+     * thread-safe and can be done from any thread. Only write operations to real project PSI
+     * require write-safe context.
+     */
+    fun createFromText(project: Project, name: String, text: String): KtFile? {
+        return PsiFileFactory.getInstance(project)
+            .createFileFromText(name, KotlinFileType.INSTANCE, text)
+            .safeAs<KtFile>()
+    }
+}
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/util/extension/VirtualFile.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/util/extension/VirtualFile.kt
@@ -1,11 +1,28 @@
 package io.github.composegears.valkyrie.util.extension
 
+import com.intellij.openapi.application.readAction
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.psi.PsiManager
 import io.github.composegears.valkyrie.parser.unified.ext.isSvgExtension
 import io.github.composegears.valkyrie.parser.unified.ext.isXmlExtension
+import io.github.composegears.valkyrie.sdk.core.extensions.safeAs
+import java.nio.file.Path
+import org.jetbrains.kotlin.psi.KtFile
 
 inline val VirtualFile.isSvg: Boolean
     get() = extension?.isSvgExtension ?: false
 
 inline val VirtualFile.isXml: Boolean
     get() = extension?.isXmlExtension ?: false
+
+fun VirtualFile.resolveKtFile(project: Project): KtFile? {
+    return PsiManager.getInstance(project).findFile(this).safeAs<KtFile>()
+}
+
+suspend fun Path.resolveKtFile(project: Project): KtFile? {
+    return readAction {
+        VfsUtil.findFile(this, true)?.resolveKtFile(project)
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public final class io/github/composegears/valkyrie/sdk/intellij/psi/iconpack/Ico`
`13`	`13`
`14`	`14`	`public final class io/github/composegears/valkyrie/sdk/intellij/psi/iconpack/IconPackPsiParser {`
`15`	`15`	`public static final field INSTANCE Lio/github/composegears/valkyrie/sdk/intellij/psi/iconpack/IconPackPsiParser;`
`16`		`- public final fun extractIconPack (Ljava/nio/file/Path;Lcom/intellij/openapi/project/Project;)Lio/github/composegears/valkyrie/sdk/intellij/psi/iconpack/IconPackInfo;`
`17`	`16`	`public final fun parse (Lorg/jetbrains/kotlin/psi/KtFile;)Lio/github/composegears/valkyrie/sdk/intellij/psi/iconpack/IconPackInfo;`
`18`	`17`	`}`
`19`	`18`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- implementation(projects.sdk.core.extensions)`
`12`	`11`	`implementation(projects.components.generator.core)`
`13`	`12`
`14`	`13`	`testImplementation(testFixtures(projects.sdk.intellij.testFixtures))`