diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.kt b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.kt index 92aa71b5a953..2c0a8417def0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.kt +++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialog.kt @@ -255,10 +255,12 @@ class ProgressDialog( if (window.isShowing) { return object : MyDialogWrapper(window) { override fun useLightPopup(): Boolean = false + override fun canRecordDialogId(): Boolean = false } } return object : MyDialogWrapper(progressWindow.myProject) { override fun useLightPopup(): Boolean = false + override fun canRecordDialogId(): Boolean = false } } // GTW-1384 - If the parent window is JOptionPane.getRootFrame() then invoke DialogWrapper(Component) instead of DialogWrapper(Project) diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialogWrapper.kt b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialogWrapper.kt index 8e83346e5acc..4e2617845154 100644 --- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialogWrapper.kt +++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressDialogWrapper.kt @@ -76,6 +76,8 @@ internal class ProgressDialogWrapper( override fun createPeer(project: Project?, canBeParent: Boolean, ideModalityType: IdeModalityType): DialogWrapperPeer { error("must not be called") } + + override fun canRecordDialogId(): Boolean = false } internal fun createDialogWrapper( diff --git a/platform/statistics/src/com/intellij/internal/statistic/eventLog/events/EventId.kt b/platform/statistics/src/com/intellij/internal/statistic/eventLog/events/EventId.kt index d6c5846af5c8..1e88f43799d7 100644 --- a/platform/statistics/src/com/intellij/internal/statistic/eventLog/events/EventId.kt +++ b/platform/statistics/src/com/intellij/internal/statistic/eventLog/events/EventId.kt @@ -35,12 +35,11 @@ abstract class BaseEventId(groupId: String, val eventId: String, val recorder: S RegisteredLogDescriptionsProcessor.registerEventDescription(groupId, eventId, description) } - private fun getLoggers(): List = StatisticsEventLogProviderUtil.getEventLogProvidersExt(recorder).map { it.logger } internal fun processLoggers(log: (StatisticsEventLogger) -> Unit) { val errors = mutableListOf() - for (logger in getLoggers()) { + for (p in StatisticsEventLogProviderUtil.getEventLogProvidersExt(recorder)) { try { - log(logger) + log(p.logger) } catch (e: Throwable) { errors.add(e)