azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add name of script file to script module info

Browse Source
This commit is contained in:
Nikolay Krasko
2016-12-09 19:59:13 +03:00
parent 868495437c
commit ab04f900df
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt
+1 -3
View File
@@ -31,8 +31,6 @@ import org.jetbrains.kotlin.script.KotlinScriptExternalDependencies
import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider
import org.jetbrains.kotlin.utils.singletonOrEmptyList import org.jetbrains.kotlin.utils.singletonOrEmptyList
private val SCRIPT_NAME_PREFIX: String = "script "
class ScriptModuleSearchScope(val scriptFile: VirtualFile, baseScope: GlobalSearchScope) : DelegatingGlobalSearchScope(baseScope) { class ScriptModuleSearchScope(val scriptFile: VirtualFile, baseScope: GlobalSearchScope) : DelegatingGlobalSearchScope(baseScope) {
override fun equals(other: Any?) = other is ScriptModuleSearchScope && scriptFile == other.scriptFile && super.equals(other) override fun equals(other: Any?) = other is ScriptModuleSearchScope && scriptFile == other.scriptFile && super.equals(other)
@@ -48,7 +46,7 @@ data class ScriptModuleInfo(val project: Project, val scriptFile: VirtualFile,
KotlinScriptExternalImportsProvider.getInstance(project)?.getExternalImports(scriptFile) KotlinScriptExternalImportsProvider.getInstance(project)?.getExternalImports(scriptFile)
} }
override val name: Name = Name.special("<$SCRIPT_NAME_PREFIX${scriptDefinition.name}>") override val name: Name = Name.special("<script ${scriptFile.name} ${scriptDefinition.name}>")
override fun contentScope() = GlobalSearchScope.fileScope(project, scriptFile) override fun contentScope() = GlobalSearchScope.fileScope(project, scriptFile)