Move common idea and compiler parts of the scripting plugin to the new jar

plugins/scripting/scripting-compiler-embeddable/build.gradle.kts

@@ -7,6 +7,7 @@ description = "Kotlin Scripting Compiler Plugin for embeddable compiler"
 
 val packedJars by configurations.creating
 dependencies {
+    packedJars(project(":kotlin-scripting-impl")) { isTransitive = false }
     packedJars(project(":kotlin-scripting-compiler")) { isTransitive = false }
     packedJars(project(":kotlin-scripting-common")) { isTransitive = false }
     packedJars(project(":kotlin-scripting-jvm")) { isTransitive = false }

plugins/scripting/scripting-compiler/build.gradle.kts

@@ -14,10 +14,10 @@ dependencies {
     compileOnly(project(":compiler:cli"))
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-jvm"))
+    compile(project(":kotlin-scripting-impl"))
     compile(kotlinStdlib())
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
 
     testCompile(project(":compiler:frontend"))
     testCompile(project(":compiler:frontend.script"))
@@ -51,8 +51,6 @@ javadocJar()
 
 dist()
 
-ideaPlugin()
-
 projectTest {
     workingDir = rootDir
 }

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCommandLineProcessor.kt

@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.CompilerConfigurationKey
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
+import org.jetbrains.kotlin.scripting.shared.KOTLIN_SCRIPTING_PLUGIN_ID
 
 object ScriptingConfigurationKeys {
     val DISABLE_SCRIPTING_PLUGIN_OPTION: CompilerConfigurationKey<Boolean> =
@@ -63,10 +64,9 @@ class ScriptingCommandLineProcessor : CommandLineProcessor {
             required = false, allowMultipleOccurrences = true
         )
 
-        val PLUGIN_ID = "kotlin.scripting"
     }
 
-    override val pluginId = PLUGIN_ID
+    override val pluginId = KOTLIN_SCRIPTING_PLUGIN_ID
     override val pluginOptions =
         listOf(
             DISABLE_SCRIPTING_PLUGIN_OPTION,

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerConfigurationExtension.kt

@@ -17,8 +17,8 @@ import org.jetbrains.kotlin.extensions.CompilerConfigurationExtension
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.script.ScriptDefinitionProvider
 import org.jetbrains.kotlin.script.StandardScriptDefinition
-import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.ScriptDefinitionsFromClasspathDiscoverySource
-import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.loadScriptTemplatesFromClasspath
+import org.jetbrains.kotlin.scripting.shared.definitions.ScriptDefinitionsFromClasspathDiscoverySource
+import org.jetbrains.kotlin.scripting.shared.definitions.loadScriptTemplatesFromClasspath
 import org.jetbrains.kotlin.scripting.legacy.CliScriptDefinitionProvider
 import java.io.File
 

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/pluginRegisrar.kt

@@ -20,6 +20,8 @@ import org.jetbrains.kotlin.script.ScriptReportSink
 import org.jetbrains.kotlin.scripting.legacy.CliScriptDefinitionProvider
 import org.jetbrains.kotlin.scripting.legacy.CliScriptDependenciesProvider
 import org.jetbrains.kotlin.scripting.legacy.CliScriptReportSink
+import org.jetbrains.kotlin.scripting.shared.extensions.ScriptExtraImportsProviderExtension
+import org.jetbrains.kotlin.scripting.shared.extensions.ScriptingResolveExtension
 
 class ScriptingCompilerConfigurationComponentRegistrar : ComponentRegistrar {
     override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
@@ -34,7 +36,9 @@ class ScriptingCompilerConfigurationComponentRegistrar : ComponentRegistrar {
             CliScriptDependenciesProvider(project)
         )
         SyntheticResolveExtension.registerExtension(project, ScriptingResolveExtension())
-        ExtraImportsProviderExtension.registerExtension(project, ScriptExtraImportsProviderExtension())
+        ExtraImportsProviderExtension.registerExtension(project,
+                                                        ScriptExtraImportsProviderExtension()
+        )
 
         val messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
         if (messageCollector != null) {

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/legacy/CliScriptDefinitionProvider.kt

@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.scripting.legacy
 import org.jetbrains.kotlin.script.KotlinScriptDefinition
 import org.jetbrains.kotlin.script.ScriptDefinitionsSource
 import org.jetbrains.kotlin.script.StandardScriptDefinition
+import org.jetbrains.kotlin.scripting.shared.definitions.LazyScriptDefinitionProvider
 import kotlin.concurrent.write
 
 open class CliScriptDefinitionProvider : LazyScriptDefinitionProvider() {

plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/legacy/CliScriptDependenciesProvider.kt

@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.script.ScriptContentLoader
 import org.jetbrains.kotlin.script.ScriptDependenciesProvider
 import org.jetbrains.kotlin.script.ScriptReportSink
 import org.jetbrains.kotlin.script.adjustByDefinition
-import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.findScriptDefinition
+import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition
 import java.io.File
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.concurrent.read

plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt

@@ -20,9 +20,9 @@ import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
 import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
-import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.SCRIPT_DEFINITION_MARKERS_PATH
-import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.discoverScriptTemplatesInClasspath
-import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.loadScriptTemplatesFromClasspath
+import org.jetbrains.kotlin.scripting.shared.definitions.SCRIPT_DEFINITION_MARKERS_PATH
+import org.jetbrains.kotlin.scripting.shared.definitions.discoverScriptTemplatesInClasspath
+import org.jetbrains.kotlin.scripting.shared.definitions.loadScriptTemplatesFromClasspath
 import org.jetbrains.kotlin.test.ConfigurationKind
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.TestCaseWithTmpdir

plugins/scripting/scripting-idea/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    compile(project(":kotlin-scripting-compiler"))
+    compile(project(":kotlin-scripting-impl"))
     compile(project(":kotlin-scripting-intellij"))
     compileOnly(project(":idea:idea-gradle"))
     compileOnly(project(":idea:idea-core"))

plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt

@@ -8,13 +8,13 @@ package org.jetbrains.kotlin.scripting.idea.plugin
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.idea.configuration.GradleProjectImportHandler
 import org.jetbrains.kotlin.idea.facet.KotlinFacet
-import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCommandLineProcessor
+import org.jetbrains.kotlin.scripting.shared.KOTLIN_SCRIPTING_PLUGIN_ID
 import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
 import java.io.File
 
 class ScriptingGradleProjectImportHandler : GradleProjectImportHandler {
 
-    val compilerPluginId = ScriptingCommandLineProcessor.PLUGIN_ID
+    val compilerPluginId = KOTLIN_SCRIPTING_PLUGIN_ID
     val gradlePluginJars = listOf(
         "scripting-gradle", // obsolete artifact name, only for compatibility with 1.2.5x, where it was introduced (and immediately dropped afterwards)
         "scripting-compiler",

plugins/scripting/scripting-impl/build.gradle.kts

@@ -0,0 +1,48 @@
+
+description = "Kotlin Scripting Implementation - shared part"
+
+plugins {
+    kotlin("jvm")
+    id("jps-compatible")
+}
+
+dependencies {
+    compileOnly(project(":compiler:frontend"))
+    compileOnly(project(":compiler:frontend.java"))
+    compileOnly(project(":compiler:frontend.script"))
+    compileOnly(project(":compiler:psi"))
+    compileOnly(project(":compiler:cli-common"))
+    compile(project(":kotlin-scripting-common"))
+    compile(project(":kotlin-scripting-jvm"))
+    compile(kotlinStdlib())
+    compileOnly(project(":kotlin-reflect-api"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
+}
+
+sourceSets {
+    "main" { projectDefault() }
+    "test" { projectDefault() }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
+    kotlinOptions {
+        languageVersion = "1.2"
+        apiVersion = "1.2"
+        freeCompilerArgs += "-Xskip-metadata-version-check"
+    }
+}
+
+publish()
+
+val jar = runtimeJar {}
+sourcesJar()
+javadocJar()
+
+dist()
+
+ideaPlugin()
+
+projectTest {
+    workingDir = rootDir
+}

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin.definitions
+package org.jetbrains.kotlin.scripting.shared.definitions
 
 import com.intellij.openapi.fileTypes.LanguageFileType
 import org.jetbrains.kotlin.idea.KotlinFileType

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionFromDiscoveredClass.kt

@@ -3,13 +3,15 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin.definitions
+package org.jetbrains.kotlin.scripting.shared.definitions
 
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import java.io.File
 import kotlin.script.experimental.annotations.KotlinScript
-import kotlin.script.experimental.api.*
+import kotlin.script.experimental.api.KotlinType
+import kotlin.script.experimental.api.ScriptCompilationConfiguration
+import kotlin.script.experimental.api.fileExtension
 import kotlin.script.experimental.host.ScriptingHostConfiguration
 import kotlin.script.experimental.host.configurationDependencies
 import kotlin.script.experimental.host.createCompilationConfigurationFromTemplate

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionProvider.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.legacy
+package org.jetbrains.kotlin.scripting.shared.definitions
 
 import com.intellij.ide.highlighter.JavaFileType
 import org.jetbrains.kotlin.idea.KotlinFileType

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin.definitions
+package org.jetbrains.kotlin.scripting.shared.definitions
 
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -125,7 +125,7 @@ internal fun discoverScriptTemplatesInClasspath(
     }
 }
 
-internal fun loadScriptTemplatesFromClasspath(
+fun loadScriptTemplatesFromClasspath(
     scriptTemplates: List<String>,
     classpath: List<File>,
     dependenciesClasspath: List<File>,

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/asmBasedAnnotationsLoading.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin.definitions
+package org.jetbrains.kotlin.scripting.shared.definitions
 
 import org.jetbrains.org.objectweb.asm.*
 

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/definitions.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin.definitions
+package org.jetbrains.kotlin.scripting.shared.definitions
 
 import com.intellij.ide.highlighter.JavaClassFileType
 import com.intellij.openapi.fileTypes.FileTypeRegistry

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptExtraImportsProviderExtension.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin
+package org.jetbrains.kotlin.scripting.shared.extensions
 
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtFile
@@ -29,6 +29,10 @@ class ScriptExtraImportsProviderExtension : ExtraImportsProviderExtension {
     override fun getExtraImports(ktFile: KtFile): Collection<KtImportInfo> =
         ktFile.takeIf { it.isScript() }?.let { file ->
             val scriptDependencies = ScriptDependenciesProvider.getInstance(file.project)?.getScriptDependencies(file.originalFile)
-            scriptDependencies?.imports?.map { ScriptExtraImportImpl(ImportPath.fromString(it)) }
+            scriptDependencies?.imports?.map {
+                ScriptExtraImportImpl(
+                    ImportPath.fromString(it)
+                )
+            }
         }.orEmpty()
 }

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptingResolveExtension.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin
+package org.jetbrains.kotlin.scripting.shared.extensions
 
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension
 import org.jetbrains.kotlin.resolve.lazy.LazyClassContext
 import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider
-import org.jetbrains.kotlin.scripting.compiler.plugin.resolve.LazyScriptDescriptor
+import org.jetbrains.kotlin.scripting.shared.resolve.LazyScriptDescriptor
 
 class ScriptingResolveExtension : SyntheticResolveExtension {
     override fun generateSyntheticClasses(

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/identifiers.kt

@@ -0,0 +1,8 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.scripting.shared
+
+const val KOTLIN_SCRIPTING_PLUGIN_ID = "kotlin.scripting"

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptClassMemberScope.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin.resolve
+package org.jetbrains.kotlin.scripting.shared.resolve
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptDescriptor.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin.resolve
+package org.jetbrains.kotlin.scripting.shared.resolve
 
 import com.intellij.openapi.vfs.StandardFileSystems
 import com.intellij.openapi.vfs.VirtualFileManager
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.resolve.source.toSourceElement
 import org.jetbrains.kotlin.script.KotlinScriptDefinition
 import org.jetbrains.kotlin.script.ScriptDependenciesProvider
 import org.jetbrains.kotlin.script.ScriptPriorities
-import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.scriptDefinitionByFileName
+import org.jetbrains.kotlin.scripting.shared.definitions.scriptDefinitionByFileName
 import org.jetbrains.kotlin.types.TypeSubstitutor
 import org.jetbrains.kotlin.types.typeUtil.isNothing
 import org.jetbrains.kotlin.types.typeUtil.isUnit

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ReplResultPropertyDescriptor.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin.resolve
+package org.jetbrains.kotlin.scripting.shared.resolve
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertiesDescriptor.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin.resolve
+package org.jetbrains.kotlin.scripting.shared.resolve
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertyDescriptor.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin.resolve
+package org.jetbrains.kotlin.scripting.shared.resolve
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations

plugins/scripting/scripting-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/scriptDescriptorUtil.kt

@@ -3,7 +3,7 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.scripting.compiler.plugin.resolve
+package org.jetbrains.kotlin.scripting.shared.resolve
 
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName