MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

[workspace model] IDEA-CR-65189 Synchronize collections usage

Browse Source 
GitOrigin-RevId: fc84c722b469e197813b814431788e62d4b0f752
This commit is contained in:
Mikhail Mazurkevich
2020-07-17 17:33:40 +03:00
committed by intellij-monorepo-bot
parent e5aab1cf97
commit 949b7765df
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
platform/workspaceModel/ide/src/com/intellij/workspaceModel/ide/impl/legacyBridge/filePointer/RootsChangeWatcher.kt
View File

@@ -68,8 +68,6 @@ internal class RootsChangeWatcher(val project: Project): Disposable {
val messageBusConnection = project.messageBus.connect()
WorkspaceModelTopics.getInstance(project).subscribeImmediately(messageBusConnection, object : WorkspaceModelChangeListener {
override fun changed(event: VersionedStorageChanged) = LOG.bracket("LibraryRootsWatcher.EntityStoreChange") {
// TODO It's also possible to calculate it on diffs
event.getAllChanges().forEach { change ->
when (change) {
is EntityChange.Added -> updateVirtualFileUrlCollections(change.entity)
@@ -87,9 +85,9 @@ internal class RootsChangeWatcher(val project: Project): Disposable {
myCollectWatchRootsFuture = myExecutor.submit {
ReadAction.run<Throwable> {
newSync(
newRoots = roots.keys,
newJarDirectories = jarDirectories.keys,
newRecursiveJarDirectories = recursiveJarDirectories.keys
newRoots = synchronized(roots) { roots.keys.toHashSet() },
newJarDirectories = synchronized(jarDirectories) { jarDirectories.keys.toHashSet() },
newRecursiveJarDirectories = synchronized(recursiveJarDirectories) { recursiveJarDirectories.keys.toHashSet() }
)
}
}
@@ -196,20 +194,24 @@ internal class RootsChangeWatcher(val project: Project): Disposable {
}
private fun updateCollection(collection: Object2IntOpenHashMap<String>, fileUrl: VirtualFileUrl, removeAction: Boolean) {
collection.compute(fileUrl.url) { _, usagesCount ->
if (removeAction) {
if (usagesCount == null || usagesCount - 1 <= 0) return@compute null else return@compute usagesCount - 1
} else {
if (usagesCount == null) return@compute 1 else return@compute usagesCount + 1
synchronized(collection) {
collection.compute(fileUrl.url) { _, usagesCount ->
if (removeAction) {
if (usagesCount == null || usagesCount - 1 <= 0) return@compute null else return@compute usagesCount - 1
} else {
if (usagesCount == null) return@compute 1 else return@compute usagesCount + 1
}
}
}
}
private fun updateCollection(collection: Object2IntOpenHashMap<String>, oldUrl: String, newUrl: String) {
if (!collection.containsKey(oldUrl)) return
val valueByOldUrl = collection.removeInt(oldUrl)
val currentValueByNewUrl = collection.getInt(newUrl)
collection[newUrl] = currentValueByNewUrl + valueByOldUrl
synchronized(collection) {
if (!collection.containsKey(oldUrl)) return
val valueByOldUrl = collection.removeInt(oldUrl)
val currentValueByNewUrl = collection.getInt(newUrl)
collection[newUrl] = currentValueByNewUrl + valueByOldUrl
}
}
private fun newSync(newRoots: Set<String>,