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

script.runtime 1.1.4: IDE and compiler use 'kotlin.script.experimental'

Browse Source
This commit is contained in:
Pavel V. Talanov
2017-07-30 18:15:41 +03:00
parent d7e62937b2
commit b0b2c046b2
23 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.script/src/org/jetbrains/kotlin/script/AsyncDependencyResolverWrapper.kt
+2 -2
View File
@@ -17,10 +17,10 @@
package org.jetbrains.kotlin.script
import kotlinx.coroutines.experimental.runBlocking
import kotlin.script.dependencies.DependenciesResolver
import kotlin.script.experimental.dependencies.DependenciesResolver
import kotlin.script.dependencies.Environment
import kotlin.script.dependencies.ScriptContents
import kotlin.script.dependencies.experimental.AsyncDependenciesResolver
import kotlin.script.experimental.dependencies.AsyncDependenciesResolver
// wraps AsyncDependenciesResolver to provide implementation for synchronous DependenciesResolver::resolve
class AsyncDependencyResolverWrapper(
compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt
+2 -2
View File
@@ -28,9 +28,9 @@ import kotlin.reflect.KClass
import kotlin.reflect.KFunction
import kotlin.reflect.KParameter
import kotlin.reflect.full.memberFunctions
import kotlin.script.dependencies.DependenciesResolver
import kotlin.script.experimental.dependencies.DependenciesResolver
import kotlin.script.dependencies.ScriptDependenciesResolver
import kotlin.script.dependencies.experimental.AsyncDependenciesResolver
import kotlin.script.experimental.dependencies.AsyncDependenciesResolver
import kotlin.script.templates.AcceptedAnnotations
open class KotlinScriptDefinitionFromAnnotatedTemplate(
compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptContentLoader.kt
+3 -3
View File
@@ -25,10 +25,10 @@ import org.jetbrains.kotlin.psi.KtAnnotationEntry
import org.jetbrains.kotlin.psi.KtFile
import java.io.File
import kotlin.reflect.KClass
import kotlin.script.dependencies.DependenciesResolver.ResolveResult.Failure
import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult.Failure
import kotlin.script.dependencies.ScriptContents
import kotlin.script.dependencies.ScriptDependencies
import kotlin.script.dependencies.ScriptReport
import kotlin.script.experimental.dependencies.ScriptDependencies
import kotlin.script.experimental.dependencies.ScriptReport
class ScriptContentLoader(private val project: Project) {
fun getScriptContents(scriptDefinition: KotlinScriptDefinition, file: VirtualFile)
compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptReportSink.kt
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.script
import com.intellij.openapi.vfs.VirtualFile
import kotlin.script.dependencies.ScriptReport
import kotlin.script.experimental.dependencies.ScriptReport
interface ScriptReportSink {
fun attachReports(scriptFile: VirtualFile, reports: List<ScriptReport>)
compiler/frontend.script/src/org/jetbrains/kotlin/script/legacyWrappers.kt
+5 -5
View File
@@ -19,10 +19,10 @@
package org.jetbrains.kotlin.script
import java.io.File
import kotlin.script.dependencies.DependenciesResolver
import kotlin.script.experimental.dependencies.DependenciesResolver
import kotlin.script.dependencies.Environment
import kotlin.script.dependencies.ScriptDependencies
import kotlin.script.dependencies.ScriptReport
import kotlin.script.experimental.dependencies.ScriptDependencies
import kotlin.script.experimental.dependencies.ScriptReport
interface LegacyResolverWrapper
@@ -30,7 +30,7 @@ interface LegacyResolverWrapper
@Deprecated("Compatibility with deprecated API")
internal class LegacyPackageDependencyResolverWrapper(
val legacyResolver: ScriptDependenciesResolver
) : kotlin.script.dependencies.DependenciesResolver, LegacyResolverWrapper {
) : kotlin.script.experimental.dependencies.DependenciesResolver, LegacyResolverWrapper {
override fun resolve(
scriptContents: kotlin.script.dependencies.ScriptContents,
environment: Environment
@@ -70,7 +70,7 @@ internal class LegacyPackageDependencyResolverWrapper(
internal class ApiChangeDependencyResolverWrapper(
override val delegate: kotlin.script.dependencies.ScriptDependenciesResolver
) : kotlin.script.dependencies.DependenciesResolver,
) : kotlin.script.experimental.dependencies.DependenciesResolver,
DependencyResolverWrapper<kotlin.script.dependencies.ScriptDependenciesResolver>,
LegacyResolverWrapper {
override fun resolve(
compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplate.kt
-3
View File
@@ -20,9 +20,6 @@ import java.io.File
import java.util.concurrent.Future
import java.util.concurrent.TimeUnit
import kotlin.reflect.KClass
import kotlin.script.dependencies.DependenciesResolver.ResolveResult
import kotlin.script.dependencies.ScriptDependencies
import kotlin.script.dependencies.ScriptReport
const val DEFAULT_SCRIPT_FILE_PATTERN = ".*\\.kts"
compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.project.Project
import java.io.File
import java.net.URLClassLoader
import kotlin.script.dependencies.DependenciesResolver
import kotlin.script.experimental.dependencies.DependenciesResolver
interface ScriptTemplatesProvider {