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

Fix tests: attach script reports in cli

Browse Source
This commit is contained in:
Natalia Selezneva
2018-05-12 00:36:13 +03:00
parent f89d5e94c5
commit 1e92dbf806
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptDependenciesProvider.kt
+7 -5
View File
@@ -16,10 +16,10 @@
package org.jetbrains.kotlin.cli.common.script package org.jetbrains.kotlin.cli.common.script
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.script.findScriptDefinition
import org.jetbrains.kotlin.script.* import org.jetbrains.kotlin.script.*
import java.io.File import java.io.File
import java.util.concurrent.locks.ReentrantReadWriteLock import java.util.concurrent.locks.ReentrantReadWriteLock
@@ -28,7 +28,7 @@ import kotlin.concurrent.write
import kotlin.script.experimental.dependencies.ScriptDependencies import kotlin.script.experimental.dependencies.ScriptDependencies
class CliScriptDependenciesProvider( class CliScriptDependenciesProvider(
project: Project, private val project: Project,
private val scriptDefinitionProvider: ScriptDefinitionProvider private val scriptDefinitionProvider: ScriptDefinitionProvider
) : ScriptDependenciesProvider { ) : ScriptDependenciesProvider {
@@ -47,9 +47,11 @@ class CliScriptDependenciesProvider(
else { else {
val scriptDef = scriptDefinitionProvider.findScriptDefinition(file) val scriptDef = scriptDefinitionProvider.findScriptDefinition(file)
if (scriptDef != null) { if (scriptDef != null) {
val deps = scriptContentLoader val result = scriptContentLoader.loadContentsAndResolveDependencies(scriptDef, file)
.loadContentsAndResolveDependencies(scriptDef, file)
.dependencies?.adjustByDefinition(scriptDef) ServiceManager.getService(project, ScriptReportSink::class.java)?.attachReports(file, result.reports)
val deps = result.dependencies?.adjustByDefinition(scriptDef)
if (deps != null) { if (deps != null) {
log.info("[kts] new cached deps for $path: ${deps.classpath.joinToString(File.pathSeparator)}") log.info("[kts] new cached deps for $path: ${deps.classpath.joinToString(File.pathSeparator)}")