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

Update resolver interface - make it return Future and add message reporter function +

Browse Source 
plus minor fixes
This commit is contained in:
Ilya Chernikov
2016-07-29 15:16:38 +02:00
parent 5117ecb817
commit 31d9da3d4f
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/script/scriptTemplate.kt
+13 -2
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.script package org.jetbrains.kotlin.script
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.openapi.vfs.StandardFileSystems
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
@@ -34,7 +35,7 @@ import java.util.concurrent.Future
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import kotlin.reflect.* import kotlin.reflect.*
const val DEFAULT_SCRIPT_FILE_PATTERN = "*.\\.kts" const val DEFAULT_SCRIPT_FILE_PATTERN = ".*\\.kts"
@Target(AnnotationTarget.CLASS) @Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME) @Retention(AnnotationRetention.RUNTIME)
@@ -102,6 +103,8 @@ data class KotlinScriptDefinitionFromTemplate(val template: KClass<out Any>,
val environment: Map<String, Any?>? = null val environment: Map<String, Any?>? = null
) : KotlinScriptDefinition { ) : KotlinScriptDefinition {
private val log = Logger.getInstance(KotlinScriptDefinitionFromTemplate::class.java)
// TODO: remove this and simplify definitionAnnotation as soon as deprecated annotations will be removed // TODO: remove this and simplify definitionAnnotation as soon as deprecated annotations will be removed
internal class ScriptTemplateDefinitionData(val resolverClass: KClass<out ScriptDependenciesResolverEx>, internal class ScriptTemplateDefinitionData(val resolverClass: KClass<out ScriptDependenciesResolverEx>,
val resolver: ScriptDependenciesResolverEx?, val resolver: ScriptDependenciesResolverEx?,
@@ -183,7 +186,15 @@ data class KotlinScriptDefinitionFromTemplate(val template: KClass<out Any>,
} }
.map { it.getProxy(classLoader) } .map { it.getProxy(classLoader) }
} }
val reportFn = { reportSeverity: ScriptDependenciesResolverEx.ReportSeverity, s: String, position: ScriptContents.Position? -> } val reportFn = { reportSeverity: ScriptDependenciesResolverEx.ReportSeverity, s: String, position: ScriptContents.Position? ->
val msg = (position?.run { "[at $line:$col]" } ?: "") + s
when (reportSeverity) {
ScriptDependenciesResolverEx.ReportSeverity.ERROR -> log.error(msg)
ScriptDependenciesResolverEx.ReportSeverity.WARNING -> log.warn(msg)
ScriptDependenciesResolverEx.ReportSeverity.INFO -> log.info(msg)
ScriptDependenciesResolverEx.ReportSeverity.DEBUG -> log.debug(msg)
}
}
val fileDeps = definitionData.resolver?.resolve(script, environment, reportFn, previousDependencies) val fileDeps = definitionData.resolver?.resolve(script, environment, reportFn, previousDependencies)
return fileDeps?.get() return fileDeps?.get()