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

gradle.kts, minor: areRelatedFilesUpToDate -> areRelatedFilesChangedBefore

Browse Source
This commit is contained in:
Sergey Rostov
2020-05-06 22:19:34 +03:00
parent f5ac45ea08
commit b089f4dd2e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleKotlinScriptConfigurationInputs.kt
+3 -2
View File
@@ -10,6 +10,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.idea.core.script.configuration.cache.CachedConfigurationInputs import org.jetbrains.kotlin.idea.core.script.configuration.cache.CachedConfigurationInputs
import org.jetbrains.kotlin.idea.scripting.gradle.roots.GradleBuildRootsManager import org.jetbrains.kotlin.idea.scripting.gradle.roots.GradleBuildRootsManager
import org.jetbrains.kotlin.idea.scripting.gradle.roots.GradleBuildRoot
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
/** /**
@@ -17,7 +18,7 @@ import org.jetbrains.kotlin.psi.KtFile
* 1. It is out of date when essential [sections] are changed * 1. It is out of date when essential [sections] are changed
* @see getGradleScriptInputsStamp * @see getGradleScriptInputsStamp
* 2. When some related file is changed (other gradle script, gradle.properties file) * 2. When some related file is changed (other gradle script, gradle.properties file)
* @see GradleScriptInputsWatcher.areRelatedFilesUpToDate * @see GradleBuildRoot.Linked.areRelatedFilesChangedBefore
* *
* [lastModifiedTs] is needed to check if some related file was changed since last update * [lastModifiedTs] is needed to check if some related file was changed since last update
*/ */
@@ -35,7 +36,7 @@ data class GradleKotlinScriptConfigurationInputs(
return buildRoot == null || return buildRoot == null ||
GradleBuildRootsManager.getInstance(project) GradleBuildRootsManager.getInstance(project)
.getBuildRoot(buildRoot) .getBuildRoot(buildRoot)
?.areRelatedFilesUpToDate(file, lastModifiedTs) ?: false ?.areRelatedFilesChangedBefore(file, lastModifiedTs) ?: false
} catch (cancel: ProcessCanceledException) { } catch (cancel: ProcessCanceledException) {
return false return false
} }
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt
+1 -1
View File
@@ -59,7 +59,7 @@ sealed class GradleBuildRoot {
LastModifiedFiles.write(dir ?: return, lastModifiedFiles) LastModifiedFiles.write(dir ?: return, lastModifiedFiles)
} }
fun areRelatedFilesUpToDate(file: VirtualFile, lastModified: Long): Boolean = fun areRelatedFilesChangedBefore(file: VirtualFile, lastModified: Long): Boolean =
lastModifiedFiles.lastModifiedTimeStampExcept(file.path) < lastModified lastModifiedFiles.lastModifiedTimeStampExcept(file.path) < lastModified
fun fileChanged(filePath: String, ts: Long) { fun fileChanged(filePath: String, ts: Long) {