diff --git a/.idea/modules.xml b/.idea/modules.xml index ad8033f3bf61..656ff4df25c9 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -843,7 +843,6 @@ - diff --git a/platform/backend/observation-impl/intellij.platform.backend.observation.impl.iml b/platform/backend/observation-impl/intellij.platform.backend.observation.impl.iml deleted file mode 100644 index e03ac9dd7c5a..000000000000 --- a/platform/backend/observation-impl/intellij.platform.backend.observation.impl.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/platform/backend/observation-impl/src/com/intellij/platform/backend/observation/impl/Observation.kt b/platform/backend/observation/src/com/intellij/platform/backend/observation/Observation.kt similarity index 93% rename from platform/backend/observation-impl/src/com/intellij/platform/backend/observation/impl/Observation.kt rename to platform/backend/observation/src/com/intellij/platform/backend/observation/Observation.kt index fc47e5b00f74..fa780d6056e8 100644 --- a/platform/backend/observation-impl/src/com/intellij/platform/backend/observation/impl/Observation.kt +++ b/platform/backend/observation/src/com/intellij/platform/backend/observation/Observation.kt @@ -1,8 +1,7 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.platform.backend.observation.impl +package com.intellij.platform.backend.observation import com.intellij.openapi.project.Project -import com.intellij.platform.backend.observation.ActivityInProgressWitness object Observation { diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml index c67b6480fcea..a9c94f016aad 100644 --- a/platform/platform-tests/intellij.platform.tests.iml +++ b/platform/platform-tests/intellij.platform.tests.iml @@ -84,6 +84,5 @@ - \ No newline at end of file diff --git a/platform/platform-tests/testSrc/com/intellij/util/ActivityInProgressServiceTest.kt b/platform/platform-tests/testSrc/com/intellij/util/ActivityInProgressServiceTest.kt index 693cebec24d2..6ae2af6f4cc1 100644 --- a/platform/platform-tests/testSrc/com/intellij/util/ActivityInProgressServiceTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/util/ActivityInProgressServiceTest.kt @@ -4,7 +4,7 @@ package com.intellij.util import com.intellij.openapi.project.Project import com.intellij.platform.backend.observation.ActivityInProgressWitness import com.intellij.platform.backend.observation.MarkupBasedActivityInProgressWitness -import com.intellij.platform.backend.observation.impl.Observation +import com.intellij.platform.backend.observation.Observation import com.intellij.platform.backend.observation.trackActivity import com.intellij.testFramework.ApplicationRule import com.intellij.testFramework.ExtensionTestUtil diff --git a/platform/warmup/intellij.platform.warmup.iml b/platform/warmup/intellij.platform.warmup.iml index 8d1f6b8c5ff2..fe107866a54d 100644 --- a/platform/warmup/intellij.platform.warmup.iml +++ b/platform/warmup/intellij.platform.warmup.iml @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/platform/warmup/src/com/intellij/warmup/util/ProjectUtil.kt b/platform/warmup/src/com/intellij/warmup/util/ProjectUtil.kt index ef2f75d729d2..cda521ecc64c 100644 --- a/platform/warmup/src/com/intellij/warmup/util/ProjectUtil.kt +++ b/platform/warmup/src/com/intellij/warmup/util/ProjectUtil.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.util.registry.Registry import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFileManager -import com.intellij.platform.backend.observation.impl.Observation +import com.intellij.platform.backend.observation.Observation import com.intellij.platform.util.progress.durationStep import com.intellij.util.asSafely import com.intellij.util.indexing.FileBasedIndex