MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[auto-import] handle modification during refresh immediately after modification

Browse Source 
simplified CRC reading action

GitOrigin-RevId: 68399e6cd07f1541b899bfccfb62846bb2b1c36b
This commit is contained in:
Sergei Vorobyov
2019-12-12 12:06:55 +00:00
committed by intellij-monorepo-bot
parent 106add34a4
commit fc1b32da0c
1 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/src/com/intellij/openapi/externalSystem/autoimport/ProjectSettingsTracker.kt
+24 -25
View File
@@ -67,8 +67,6 @@ class ProjectSettingsTracker(
fun getModificationType() = modificationType.get()
private fun hasChanges() = hasChanges(calculateSettingsFilesCRC())
private fun hasChanges(newSettingsFilesCRC: Map<String, Long>): Boolean {
val oldSettingsFilesCRC = settingsFilesCRC.get()
if (newSettingsFilesCRC.size != oldSettingsFilesCRC.size) return true
@@ -83,13 +81,12 @@ class ProjectSettingsTracker(
private fun applyChanges() {
applyChangesOperation.startTask()
submitSettingsFilesRefresh {
nonBlockingReadAction {
settingsFilesCRC.set(calculateSettingsFilesCRC())
submitSettingsFilesCRCCalculation { newSettingsFilesCRC ->
settingsFilesCRC.set(newSettingsFilesCRC)
modificationType.set(null)
status.markSynchronized(currentTime())
}.finishOnUiThread {
applyChangesOperation.finishTask()
}.submit()
}
}
}
@@ -100,30 +97,27 @@ class ProjectSettingsTracker(
private fun applyUnknownChanges() {
applyChangesOperation.startTask()
submitSettingsFilesRefresh {
nonBlockingReadAction {
val newSettingsFilesCRC = calculateSettingsFilesCRC()
submitSettingsFilesCRCCalculation { newSettingsFilesCRC ->
settingsFilesCRC.updateAndGet { newSettingsFilesCRC + it }
if (!hasChanges(newSettingsFilesCRC)) {
modificationType.set(null)
status.markSynchronized(currentTime())
}
}.finishOnUiThread {
applyChangesOperation.finishTask()
}.submit()
}
}
}
fun refreshChanges() {
submitSettingsFilesRefresh {
nonBlockingReadAction {
submitSettingsFilesCRCCalculation { newSettingsFilesCRC ->
modificationType.set(null)
when (hasChanges()) {
when (hasChanges(newSettingsFilesCRC)) {
true -> status.markDirty(currentTime())
else -> status.markReverted(currentTime())
}
}.finishOnUiThread {
projectTracker.scheduleProjectRefresh()
}.submit()
}
}
}
@@ -147,7 +141,11 @@ class ProjectSettingsTracker(
}
}
private fun NonBlockingReadActionBuilder<*>.submit() = submit(parentDisposable)
private fun submitSettingsFilesCRCCalculation(action: (Map<String, Long>) -> Unit) {
nonBlockingReadAction { calculateSettingsFilesCRC() }
.finishOnUiThread { action(it) }
.submit(parentDisposable)
}
private fun invokeLater(action: () -> Unit) {
val application = ApplicationManager.getApplication()
@@ -263,8 +261,14 @@ class ProjectSettingsTracker(
fun updateFile(path: String, modificationStamp: Long, type: ModificationType) {
hasRelevantChanges = true
logModificationAsDebug(path, modificationStamp, type)
modificationType.updateAndGet { if (it == INTERNAL) INTERNAL else type }
status.markModified(currentTime())
if (applyChangesOperation.isOperationCompleted()) {
modificationType.updateAndGet { if (it == INTERNAL) INTERNAL else type }
status.markModified(currentTime())
}
else {
modificationType.set(null)
status.markDirty(currentTime())
}
}
fun init() {
@@ -274,18 +278,13 @@ class ProjectSettingsTracker(
fun apply() {
if (hasRelevantChanges) {
nonBlockingReadAction {
if (!hasChanges()) {
submitSettingsFilesCRCCalculation { newSettingsFilesCRC ->
if (!hasChanges(newSettingsFilesCRC)) {
modificationType.set(null)
status.markReverted(currentTime())
}
if (!applyChangesOperation.isOperationCompleted()) {
modificationType.set(null)
status.markDirty(currentTime())
}
}.finishOnUiThread {
projectTracker.scheduleChangeProcessing()
}.submit()
}
}
}