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

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
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.script.KotlinScriptDefinition
import kotlin.script.dependencies.ScriptDependencies
import kotlin.script.experimental.dependencies.ScriptDependencies
class ScriptModuleSearchScope(val scriptFile: VirtualFile, baseScope: GlobalSearchScope) : DelegatingGlobalSearchScope(baseScope) {
override fun equals(other: Any?) = other is ScriptModuleSearchScope && scriptFile == other.scriptFile && super.equals(other)
@@ -34,7 +34,7 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.idea.core.script.IdeScriptReportSink
import org.jetbrains.kotlin.psi.KtFile
import kotlin.script.dependencies.ScriptReport
import kotlin.script.experimental.dependencies.ScriptReport
class ScriptExternalHighlightingPass(
private val file: KtFile,
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.core.script
import com.intellij.openapi.util.Key
import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.script.ScriptReportSink
import kotlin.script.dependencies.ScriptReport
import kotlin.script.experimental.dependencies.ScriptReport
class IdeScriptReportSink : ScriptReportSink {
override fun attachReports(scriptFile: VirtualFile, reports: List<ScriptReport>) {
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.core.util.EDT
import java.util.concurrent.locks.ReentrantReadWriteLock
import kotlin.concurrent.read
import kotlin.concurrent.write
import kotlin.script.dependencies.ScriptDependencies
import kotlin.script.experimental.dependencies.ScriptDependencies
internal class ScriptDependenciesCache(private val project: Project) {
private val cacheLock = ReentrantReadWriteLock()
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.caches.FileAttributeService
import java.io.DataInput
import java.io.DataOutput
import java.io.File
import kotlin.script.dependencies.ScriptDependencies
import kotlin.script.experimental.dependencies.ScriptDependencies
object ScriptDependenciesFileAttribute {
private val VERSION = 1
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider
import org.jetbrains.kotlin.script.ScriptDependenciesProvider
import org.jetbrains.kotlin.script.makeScriptDefsFromTemplatesProviderExtensions
import java.io.File
import kotlin.script.dependencies.ScriptDependencies
import kotlin.script.experimental.dependencies.ScriptDependencies
// NOTE: this service exists exclusively because ScriptDependencyManager
@@ -36,9 +36,9 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.script.*
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.Executors
import kotlin.script.dependencies.DependenciesResolver
import kotlin.script.dependencies.ScriptDependencies
import kotlin.script.dependencies.experimental.AsyncDependenciesResolver
import kotlin.script.experimental.dependencies.DependenciesResolver
import kotlin.script.experimental.dependencies.ScriptDependencies
import kotlin.script.experimental.dependencies.AsyncDependenciesResolver
internal class ScriptDependenciesUpdater(
private val project: Project,
@@ -25,7 +25,8 @@ import org.jetbrains.kotlin.script.ScriptTemplatesProvider
import org.jetbrains.kotlin.utils.PathUtil
import java.io.File
import kotlin.script.dependencies.*
import kotlin.script.dependencies.DependenciesResolver.ResolveResult
import kotlin.script.experimental.dependencies.*
import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult
import kotlin.script.templates.standard.ScriptTemplateWithArgs
class StandardKotlinScriptTemplateProvider(val project: Project) : ScriptTemplatesProvider {