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

Indexes should be updated if there are new dependencies for script file

Browse Source 
KT-26271 Fixed
This commit is contained in:
Natalia Selezneva
2018-10-01 15:29:33 +03:00
parent c4aab8340b
commit 28e43b0487
6 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt
+1 -1
View File
@@ -77,7 +77,7 @@ class ScriptDependenciesManager internal constructor(
@TestOnly @TestOnly
fun updateScriptDependenciesSynchronously(virtualFile: VirtualFile, project: Project) { fun updateScriptDependenciesSynchronously(virtualFile: VirtualFile, project: Project) {
val scriptDefinition = findScriptDefinition(virtualFile, project)!! val scriptDefinition = findScriptDefinition(virtualFile, project)!!
SyncScriptDependenciesLoader(virtualFile, scriptDefinition, project, shouldNotifyRootsChanged = true).updateDependencies() SyncScriptDependenciesLoader(virtualFile, scriptDefinition, project).updateDependencies()
} }
} }
} }
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt
+3 -3
View File
@@ -57,7 +57,7 @@ class ScriptDependenciesUpdater(
val scriptDef = findScriptDefinition(file, project) ?: return ScriptDependencies.Empty val scriptDef = findScriptDefinition(file, project) ?: return ScriptDependencies.Empty
FromFileAttributeScriptDependenciesLoader(file, scriptDef, project).updateDependencies() FromFileAttributeScriptDependenciesLoader(file, scriptDef, project).updateDependencies()
ScriptDependenciesLoader.updateDependencies(file, scriptDef, project, shouldNotifyRootsChanged = false) ScriptDependenciesLoader.updateDependencies(file, scriptDef, project)
return cache[file] ?: ScriptDependencies.Empty return cache[file] ?: ScriptDependencies.Empty
} }
@@ -81,7 +81,7 @@ class ScriptDependenciesUpdater(
val scriptDef = ktFile.script?.kotlinScriptDefinition ?: return val scriptDef = ktFile.script?.kotlinScriptDefinition ?: return
if (!ProjectRootsUtil.isInProjectSource(ktFile, includeScriptsOutsideSourceRoots = true)) return if (!ProjectRootsUtil.isInProjectSource(ktFile, includeScriptsOutsideSourceRoots = true)) return
ScriptDependenciesLoader.updateDependencies(file, scriptDef, project, shouldNotifyRootsChanged = true) ScriptDependenciesLoader.updateDependencies(file, scriptDef, project)
} }
}) })
@@ -113,7 +113,7 @@ class ScriptDependenciesUpdater(
scriptsQueue.addRequest( scriptsQueue.addRequest(
{ {
FileDocumentManager.getInstance().saveDocument(document) FileDocumentManager.getInstance().saveDocument(document)
ScriptDependenciesLoader.updateDependencies(file, scriptDef, project, shouldNotifyRootsChanged = true) ScriptDependenciesLoader.updateDependencies(file, scriptDef, project)
}, },
scriptChangesListenerDelay, scriptChangesListenerDelay,
true true
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/AsyncScriptDependenciesLoader.kt
+1 -1
View File
@@ -22,7 +22,7 @@ class AsyncScriptDependenciesLoader(
file: VirtualFile, file: VirtualFile,
scriptDef: KotlinScriptDefinition, scriptDef: KotlinScriptDefinition,
project: Project project: Project
) : ScriptDependenciesLoader(file, scriptDef, project, true) { ) : ScriptDependenciesLoader(file, scriptDef, project) {
override fun loadDependencies() { override fun loadDependencies() {
if (!shouldSendNewRequest(lastRequest)) { if (!shouldSendNewRequest(lastRequest)) {
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/FromFileAttributeScriptDependenciesLoader.kt
+1 -1
View File
@@ -15,7 +15,7 @@ class FromFileAttributeScriptDependenciesLoader(
file: VirtualFile, file: VirtualFile,
scriptDef: KotlinScriptDefinition, scriptDef: KotlinScriptDefinition,
project: Project project: Project
) : ScriptDependenciesLoader(file, scriptDef, project, true) { ) : ScriptDependenciesLoader(file, scriptDef, project) {
override fun loadDependencies() { override fun loadDependencies() {
val deserializedDependencies = file.scriptDependencies ?: return val deserializedDependencies = file.scriptDependencies ?: return
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/ScriptDependenciesLoader.kt
+5 -8
View File
@@ -14,6 +14,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ex.ProjectRootManagerEx import com.intellij.openapi.roots.ex.ProjectRootManagerEx
import com.intellij.openapi.util.EmptyRunnable import com.intellij.openapi.util.EmptyRunnable
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.util.ui.UIUtil
import org.jetbrains.kotlin.idea.core.script.* import org.jetbrains.kotlin.idea.core.script.*
import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.script.* import org.jetbrains.kotlin.script.*
@@ -25,8 +26,7 @@ import kotlin.script.experimental.dependencies.ScriptDependencies
abstract class ScriptDependenciesLoader( abstract class ScriptDependenciesLoader(
protected val file: VirtualFile, protected val file: VirtualFile,
protected val scriptDef: KotlinScriptDefinition, protected val scriptDef: KotlinScriptDefinition,
protected val project: Project, protected val project: Project
private val shouldNotifyRootsChanged: Boolean
) { ) {
companion object { companion object {
private val loaders = ConcurrentHashMap<VirtualFile, ScriptDependenciesLoader>() private val loaders = ConcurrentHashMap<VirtualFile, ScriptDependenciesLoader>()
@@ -34,8 +34,7 @@ abstract class ScriptDependenciesLoader(
fun updateDependencies( fun updateDependencies(
file: VirtualFile, file: VirtualFile,
scriptDef: KotlinScriptDefinition, scriptDef: KotlinScriptDefinition,
project: Project, project: Project
shouldNotifyRootsChanged: Boolean
) { ) {
val existingLoader = loaders[file] val existingLoader = loaders[file]
if (existingLoader != null) return existingLoader.updateDependencies() if (existingLoader != null) return existingLoader.updateDependencies()
@@ -43,7 +42,7 @@ abstract class ScriptDependenciesLoader(
val newLoader = when (scriptDef.dependencyResolver) { val newLoader = when (scriptDef.dependencyResolver) {
is AsyncDependenciesResolver, is AsyncDependenciesResolver,
is LegacyResolverWrapper -> AsyncScriptDependenciesLoader(file, scriptDef, project) is LegacyResolverWrapper -> AsyncScriptDependenciesLoader(file, scriptDef, project)
else -> SyncScriptDependenciesLoader(file, scriptDef, project, shouldNotifyRootsChanged) else -> SyncScriptDependenciesLoader(file, scriptDef, project)
} }
loaders.put(file, newLoader) loaders.put(file, newLoader)
newLoader.updateDependencies() newLoader.updateDependencies()
@@ -107,8 +106,6 @@ abstract class ScriptDependenciesLoader(
@Suppress("EXPERIMENTAL_FEATURE_WARNING") @Suppress("EXPERIMENTAL_FEATURE_WARNING")
protected fun notifyRootsChanged() { protected fun notifyRootsChanged() {
if (!shouldNotifyRootsChanged) return
val doNotifyRootsChanged = Runnable { val doNotifyRootsChanged = Runnable {
runWriteAction { runWriteAction {
if (project.isDisposed) return@runWriteAction if (project.isDisposed) return@runWriteAction
@@ -119,7 +116,7 @@ abstract class ScriptDependenciesLoader(
} }
if (ApplicationManager.getApplication().isUnitTestMode) { if (ApplicationManager.getApplication().isUnitTestMode) {
doNotifyRootsChanged.run() UIUtil.invokeLaterIfNeeded(doNotifyRootsChanged)
} else { } else {
TransactionGuard.getInstance().submitTransactionLater(project, doNotifyRootsChanged) TransactionGuard.getInstance().submitTransactionLater(project, doNotifyRootsChanged)
} }
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/SyncScriptDependenciesLoader.kt
+2 -3
View File
@@ -12,9 +12,8 @@ import org.jetbrains.kotlin.script.KotlinScriptDefinition
class SyncScriptDependenciesLoader( class SyncScriptDependenciesLoader(
file: VirtualFile, file: VirtualFile,
scriptDef: KotlinScriptDefinition, scriptDef: KotlinScriptDefinition,
project: Project, project: Project
shouldNotifyRootsChanged: Boolean ) : ScriptDependenciesLoader(file, scriptDef, project) {
) : ScriptDependenciesLoader(file, scriptDef, project, shouldNotifyRootsChanged) {
override fun loadDependencies() { override fun loadDependencies() {
val result = contentLoader.loadContentsAndResolveDependencies(scriptDef, file) val result = contentLoader.loadContentsAndResolveDependencies(scriptDef, file)