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

Port compiler to the script-runtime with script base classes

Browse Source
This commit is contained in:
Ilya Chernikov
2017-03-20 17:06:22 +01:00
parent 7ceaca133a
commit 88652154c9
29 changed files with 69 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt
+1 -1
View File
@@ -27,8 +27,8 @@ import org.jetbrains.kotlin.idea.core.script.KotlinScriptConfigurationManager
import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.script.KotlinScriptDefinition
import org.jetbrains.kotlin.script.KotlinScriptExternalDependencies
import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider
import kotlin.script.dependencies.KotlinScriptExternalDependencies
class ScriptModuleSearchScope(val scriptFile: VirtualFile, baseScope: GlobalSearchScope) : DelegatingGlobalSearchScope(baseScope) {
override fun equals(other: Any?) = other is ScriptModuleSearchScope && scriptFile == other.scriptFile && super.equals(other)
idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt
+5 -1
View File
@@ -21,10 +21,14 @@ import com.intellij.openapi.projectRoots.JavaSdk
import com.intellij.openapi.projectRoots.ProjectJdkTable
import com.intellij.openapi.projectRoots.ex.PathUtilEx
import org.jetbrains.kotlin.idea.core.script.dependencies.KotlinScriptResolveScopeProvider
import org.jetbrains.kotlin.script.*
import org.jetbrains.kotlin.script.ScriptTemplatesProvider
import org.jetbrains.kotlin.utils.PathUtil
import java.io.File
import java.util.concurrent.Future
import kotlin.script.dependencies.KotlinScriptExternalDependencies
import kotlin.script.dependencies.PseudoFuture
import kotlin.script.dependencies.ScriptContents
import kotlin.script.dependencies.ScriptDependenciesResolver
import kotlin.script.templates.standard.ScriptTemplateWithArgs
class StandardKotlinScriptTemplateProvider(val project: Project) : ScriptTemplatesProvider {
idea/testData/script/definition/highlighting/additionalImports/template/template.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package custom.scriptDefinition
import org.jetbrains.kotlin.script.*
import kotlin.script.dependencies.*
import kotlin.script.templates.*
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
idea/testData/script/definition/highlighting/customBaseClass/template/template.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package custom.scriptDefinition
import org.jetbrains.kotlin.script.*
import kotlin.script.dependencies.*
import kotlin.script.templates.*
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
idea/testData/script/definition/highlighting/customLibrary/template/template.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package custom.scriptDefinition
import org.jetbrains.kotlin.script.*
import kotlin.script.dependencies.*
import kotlin.script.templates.*
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
idea/testData/script/definition/highlighting/simple/template/template.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package custom.scriptDefinition
import org.jetbrains.kotlin.script.*
import kotlin.script.dependencies.*
import kotlin.script.templates.*
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
idea/testData/script/definition/navigation/customBaseClass/template/template.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package custom.scriptDefinition
import org.jetbrains.kotlin.script.*
import kotlin.script.dependencies.*
import kotlin.script.templates.*
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
idea/testData/script/definition/navigation/javaLib/template/template.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package custom.scriptDefinition
import org.jetbrains.kotlin.script.*
import kotlin.script.dependencies.*
import kotlin.script.templates.*
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
idea/testData/script/definition/navigation/javaLibWithSources/template/template.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package custom.scriptDefinition
import org.jetbrains.kotlin.script.*
import kotlin.script.dependencies.*
import kotlin.script.templates.*
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
idea/testData/script/definition/navigation/kotlinLib/template/template.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package custom.scriptDefinition
import org.jetbrains.kotlin.script.*
import kotlin.script.dependencies.*
import kotlin.script.templates.*
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
idea/testData/script/definition/navigation/kotlinLibWithSources/template/template.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package custom.scriptDefinition
import org.jetbrains.kotlin.script.*
import kotlin.script.dependencies.*
import kotlin.script.templates.*
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
idea/testData/script/definition/navigation/stdlib/template/template.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package custom.scriptDefinition
import org.jetbrains.kotlin.script.*
import kotlin.script.dependencies.*
import kotlin.script.templates.*
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
idea/testData/script/definition/navigation/stdlibWithSources/template/template.kt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package custom.scriptDefinition
import org.jetbrains.kotlin.script.*
import kotlin.script.dependencies.*
import kotlin.script.templates.*
import java.io.File
import java.util.concurrent.CompletableFuture
import java.util.concurrent.Future
idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+1 -1
View File
@@ -71,7 +71,7 @@ abstract class AbstractScriptConfigurationTest : AbstractPsiCheckerTest() {
protected fun configureScriptEnvironment(path: String) {
val templateOutDir = compileLibToDir(
File("${path}template"),
classpath = listOf(PathUtil.getKotlinPathsForDistDirectory().compilerPath.path)
classpath = listOf(PathUtil.getKotlinPathsForDistDirectory().scriptRuntimePath.path)
)
val libSrcDir = File("${path}lib")