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

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

Browse Source
This commit is contained in:
Ilya Chernikov
2019-03-20 19:29:18 +01:00
parent af63fcb3be
commit c56382a62b
54 changed files with 141 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/build.gradle.kts
+1 -1
View File
@@ -18,7 +18,7 @@ dependencies {
compile(project(":idea:ide-common"))
compile(project(":idea:idea-jps-common"))
compile(project(":plugins:android-extensions-compiler"))
compile(project(":kotlin-scripting-compiler"))
compile(project(":kotlin-scripting-impl"))
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
+2 -2
View File
@@ -42,8 +42,8 @@ import org.jetbrains.kotlin.script.KotlinScriptDefinition
import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate
import org.jetbrains.kotlin.script.ScriptDefinitionProvider
import org.jetbrains.kotlin.script.ScriptTemplatesProvider
import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.KotlinScriptDefinitionAdapterFromNewAPI
import org.jetbrains.kotlin.scripting.legacy.LazyScriptDefinitionProvider
import org.jetbrains.kotlin.scripting.shared.definitions.KotlinScriptDefinitionAdapterFromNewAPI
import org.jetbrains.kotlin.scripting.shared.definitions.LazyScriptDefinitionProvider
import org.jetbrains.kotlin.utils.PathUtil
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
import org.jetbrains.kotlin.utils.addToStdlib.flattenTo
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt
+1 -1
View File
@@ -25,7 +25,7 @@ import com.intellij.util.io.URLUtil
import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.idea.core.script.dependencies.SyncScriptDependenciesLoader
import org.jetbrains.kotlin.script.ScriptDependenciesProvider
import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.findScriptDefinition
import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition
import java.io.File
import kotlin.script.experimental.dependencies.ScriptDependencies
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt
+2 -2
View File
@@ -41,8 +41,8 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
import org.jetbrains.kotlin.script.KotlinScriptDefinition
import org.jetbrains.kotlin.script.LegacyResolverWrapper
import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.findScriptDefinition
import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.scriptDefinition
import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition
import org.jetbrains.kotlin.scripting.shared.definitions.scriptDefinition
import kotlin.script.experimental.dependencies.AsyncDependenciesResolver
import kotlin.script.experimental.dependencies.ScriptDependencies
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/AsyncScriptDependenciesLoader.kt
+1 -1
View File
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings
import org.jetbrains.kotlin.script.KotlinScriptDefinition
import org.jetbrains.kotlin.script.LegacyResolverWrapper
import org.jetbrains.kotlin.script.asResolveFailure
import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.findScriptDefinition
import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition
import java.util.concurrent.ConcurrentLinkedQueue
import java.util.concurrent.locks.ReentrantReadWriteLock
import kotlin.concurrent.write
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
import org.jetbrains.kotlin.idea.core.script.StandardIdeScriptDefinition
import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate
import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.findScriptDefinition
import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition
class KotlinScriptResolveScopeProvider : ResolveScopeProvider() {
companion object {