From 9b2f801d9a1017285687da7c3bd380f23d7f2af9 Mon Sep 17 00:00:00 2001 From: Konstantin Nisht Date: Sun, 19 May 2024 20:01:22 +0200 Subject: [PATCH] IJPL-797 `intellij.platform.backend.observation` review internal API GitOrigin-RevId: 8e9081caf15ec4c4ac877eb4753cdb08f2613e94 --- .../observation/{api-dump-unreviewed.txt => api-dump.txt} | 3 --- .../platform/backend/observation/ActivityTracker.kt | 6 ------ .../intellij/platform/backend/observation/Observation.kt | 2 +- .../src/com/intellij/platform/backend/observation/util.kt | 5 ++++- 4 files changed, 5 insertions(+), 11 deletions(-) rename platform/backend/observation/{api-dump-unreviewed.txt => api-dump.txt} (89%) diff --git a/platform/backend/observation/api-dump-unreviewed.txt b/platform/backend/observation/api-dump.txt similarity index 89% rename from platform/backend/observation/api-dump-unreviewed.txt rename to platform/backend/observation/api-dump.txt index 63debdb99e00..c251c90476bb 100644 --- a/platform/backend/observation/api-dump-unreviewed.txt +++ b/platform/backend/observation/api-dump.txt @@ -1,12 +1,9 @@ com.intellij.platform.backend.observation.ActivityKey - a:getPresentableName():java.lang.String com.intellij.platform.backend.observation.ActivityTracker -- sf:Companion:com.intellij.platform.backend.observation.ActivityTracker$Companion - a:awaitConfiguration(com.intellij.openapi.project.Project,kotlin.coroutines.Continuation):java.lang.Object - a:getPresentableName():java.lang.String - a:isInProgress(com.intellij.openapi.project.Project,kotlin.coroutines.Continuation):java.lang.Object -f:com.intellij.platform.backend.observation.ActivityTracker$Companion -- f:getEP_NAME():com.intellij.openapi.extensions.ExtensionPointName f:com.intellij.platform.backend.observation.Observation - sf:INSTANCE:com.intellij.platform.backend.observation.Observation - f:awaitConfiguration(com.intellij.openapi.project.Project,kotlin.jvm.functions.Function1,kotlin.coroutines.Continuation):java.lang.Object diff --git a/platform/backend/observation/src/com/intellij/platform/backend/observation/ActivityTracker.kt b/platform/backend/observation/src/com/intellij/platform/backend/observation/ActivityTracker.kt index 9eb15ef53ec7..76130a9a79fd 100644 --- a/platform/backend/observation/src/com/intellij/platform/backend/observation/ActivityTracker.kt +++ b/platform/backend/observation/src/com/intellij/platform/backend/observation/ActivityTracker.kt @@ -3,9 +3,7 @@ package com.intellij.platform.backend.observation -import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.project.Project -import org.jetbrains.annotations.ApiStatus.Experimental import org.jetbrains.annotations.Nls /** @@ -40,10 +38,6 @@ import org.jetbrains.annotations.Nls */ interface ActivityTracker { - companion object { - val EP_NAME: ExtensionPointName = ExtensionPointName("com.intellij.activityTracker") - } - /** * The user-visible name of this tracker. */ diff --git a/platform/backend/observation/src/com/intellij/platform/backend/observation/Observation.kt b/platform/backend/observation/src/com/intellij/platform/backend/observation/Observation.kt index fa3676095da7..08be28cccc67 100644 --- a/platform/backend/observation/src/com/intellij/platform/backend/observation/Observation.kt +++ b/platform/backend/observation/src/com/intellij/platform/backend/observation/Observation.kt @@ -70,7 +70,7 @@ object Observation { } private suspend fun collectTrackersFromExtensions(project: Project): List { - return ActivityTracker.EP_NAME.extensionList.map { + return EP_NAME.extensionList.map { object : GenericActivityTracker { override val name: String = it.presentableName override suspend fun isInProgress(): Boolean = it.isInProgress(project) diff --git a/platform/backend/observation/src/com/intellij/platform/backend/observation/util.kt b/platform/backend/observation/src/com/intellij/platform/backend/observation/util.kt index 8bbd1cf2d1f3..e9f15bb1cc09 100644 --- a/platform/backend/observation/src/com/intellij/platform/backend/observation/util.kt +++ b/platform/backend/observation/src/com/intellij/platform/backend/observation/util.kt @@ -5,6 +5,7 @@ package com.intellij.platform.backend.observation import com.intellij.concurrency.currentThreadContext +import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.project.Project import com.intellij.util.concurrency.BlockingJob import com.intellij.util.concurrency.annotations.RequiresBlockingContext @@ -58,4 +59,6 @@ fun Project.trackActivity(key: ActivityKey, action: Runnable): Unit { fun CoroutineScope.launchTracked(context: CoroutineContext = EmptyCoroutineContext, block: suspend CoroutineScope.() -> Unit) { val blockingJob = currentThreadContext()[BlockingJob] ?: EmptyCoroutineContext launch(context + blockingJob, CoroutineStart.DEFAULT, block) -} \ No newline at end of file +} + +internal val EP_NAME: ExtensionPointName = ExtensionPointName("com.intellij.activityTracker") \ No newline at end of file