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/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptDependenciesProvider.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import java.io.File
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
class CliScriptDependenciesProvider(
project: Project,
compiler/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptReportSink.kt
+1 -1
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.script.ScriptReportSink
import kotlin.script.dependencies.ScriptReport
import kotlin.script.experimental.dependencies.ScriptReport
class CliScriptReportSink(private val messageCollector: MessageCollector) : ScriptReportSink {
override fun attachReports(scriptFile: VirtualFile, reports: List<ScriptReport>) {
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericCompilerState.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.cli.jvm.repl.messages.DiagnosticMessageHolder
import org.jetbrains.kotlin.descriptors.ScriptDescriptor
import org.jetbrains.kotlin.psi.KtFile
import java.util.concurrent.locks.ReentrantReadWriteLock
import kotlin.script.dependencies.ScriptDependencies
import kotlin.script.experimental.dependencies.ScriptDependencies
class ReplCompilerStageHistory(private val state: GenericReplCompilerState) : BasicReplStageHistory<ScriptDescriptor>(state.lock) {
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 {
compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.NameUtils
import org.jetbrains.kotlin.parsing.KotlinParserDefinition
import org.jetbrains.kotlin.psi.KtScript
import kotlin.reflect.KClass
import kotlin.script.dependencies.DependenciesResolver
import kotlin.script.experimental.dependencies.DependenciesResolver
import kotlin.script.templates.standard.ScriptTemplateWithArgs
open class KotlinScriptDefinition(val template: KClass<out Any>) {
compiler/frontend/src/org/jetbrains/kotlin/script/ScriptDependenciesProvider.kt
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiFile
import kotlin.script.dependencies.ScriptDependencies
import kotlin.script.experimental.dependencies.ScriptDependencies
interface ScriptDependenciesProvider {
fun getScriptDependencies(file: VirtualFile): ScriptDependencies?
compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+1 -1
View File
@@ -26,7 +26,7 @@ import com.intellij.testFramework.TestDataFile;
import kotlin.collections.ArraysKt;
import kotlin.collections.CollectionsKt;
import kotlin.io.FilesKt;
import kotlin.script.dependencies.ScriptDependencies;
import kotlin.script.experimental.dependencies.ScriptDependencies;
import kotlin.text.Charsets;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
+2 -1
View File
@@ -38,7 +38,8 @@ import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import kotlin.concurrent.thread
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.ScriptTemplateDefinition
import kotlin.test.fail
compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt
+3 -2
View File
@@ -48,8 +48,9 @@ import java.net.URLClassLoader
import java.util.concurrent.Future
import kotlin.reflect.KClass
import kotlin.script.dependencies.*
import kotlin.script.dependencies.DependenciesResolver.ResolveResult
import kotlin.script.dependencies.experimental.AsyncDependenciesResolver
import kotlin.script.experimental.dependencies.*
import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult
import kotlin.script.experimental.dependencies.AsyncDependenciesResolver
import kotlin.script.templates.AcceptedAnnotations
import kotlin.script.templates.ScriptTemplateDefinition
import kotlin.script.templates.standard.ScriptTemplateWithArgs
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt
+1 -1
View File
@@ -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)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ScriptExternalHighlightingPass.kt
+1 -1
View File
@@ -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,
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/IdeScriptReportSink.kt
+1 -1
View File
@@ -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>) {
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt
+1 -1
View File
@@ -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()
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesFileAttribute.kt
+1 -1
View File
@@ -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
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt
+1 -1
View File
@@ -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
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt
+3 -3
View File
@@ -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,
idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt
+2 -1
View File
@@ -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 {