@@ -9,21 +9,29 @@ import org.jetbrains.kotlin.analysis.api.projectStructure.KaModule
99import org.jetbrains.kotlin.base.fir.scripting.projectStructure.modules.KaScriptDependencyLibraryModuleImpl
1010import org.jetbrains.kotlin.base.fir.scripting.projectStructure.modules.KaScriptModuleImpl
1111import org.jetbrains.kotlin.idea.KotlinFileType
12- import org.jetbrains.kotlin.idea.core.script.k2.modules.KotlinScriptLibraryEntity
1312import org.jetbrains.kotlin.idea.base.fir.projectStructure.FirKaModuleFactory
13+ import org.jetbrains.kotlin.idea.core.script.k2.modules.KotlinScriptLibraryEntity
1414import org.jetbrains.kotlin.psi.KtFile
15+ import org.jetbrains.kotlin.scripting.definitions.isNonScript
1516
1617internal class FirKaScriptingModuleFactory : FirKaModuleFactory {
1718 override fun createScriptLibraryModule (
18- project : Project ,
19- entity : KotlinScriptLibraryEntity
19+ project : Project , entity : KotlinScriptLibraryEntity
2020 ): KaLibraryModule {
2121 return KaScriptDependencyLibraryModuleImpl (entity, project)
2222 }
2323
2424 override fun createKaModuleByPsiFile (file : PsiFile ): KaModule ? {
2525 val ktFile = file as ? KtFile ? : return null
26+
27+ /*
28+ For compiled scripts we should not create any KaScriptModule
29+ as we do not treat them as scripts, a proper module for them
30+ should be KaScriptDependencyModule. */
31+ if (ktFile.isCompiled) return null
32+
2633 if (file.virtualFile is VirtualFileWindow ) return null
34+ if (file.virtualFile.isNonScript()) return null
2735
2836 if (file.virtualFile.extension == KotlinFileType .EXTENSION ) {
2937 /*
@@ -37,23 +45,6 @@ internal class FirKaScriptingModuleFactory : FirKaModuleFactory {
3745 return null
3846 }
3947
40- return when {
41- ! ktFile.isScript() -> {
42- null
43- }
44- ktFile.isCompiled -> {
45- /*
46- For compiled scripts we should not create any KaScriptModule
47- as we do not treat them as scripts, a proper module for them
48- should be KaScriptDependencyModule.
49- */
50- null
51- }
52- else -> {
53- val virtualFile = file.originalFile.virtualFile
54-
55- KaScriptModuleImpl (file.project, virtualFile)
56- }
57- }
48+ return KaScriptModuleImpl (file.project, file.originalFile.virtualFile)
5849 }
5950}
0 commit comments