MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[platform] IJPL-170: Squash modules

Browse Source 
GitOrigin-RevId: 589ef6c26e9bba1fcf9c50156981fb85b52ff043
This commit is contained in:
Konstantin Nisht
2023-10-25 12:48:37 +02:00
committed by intellij-monorepo-bot
parent 5c7e832bbb
commit e342f747e2
7 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/modules.xml generated
View File

@@ -843,7 +843,6 @@
<module fileurl="file://$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" filepath="$PROJECT_DIR$/platform/analysis-api/intellij.platform.analysis.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/intellij.platform.analysis.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/backend/observation/intellij.platform.backend.observation.iml" filepath="$PROJECT_DIR$/platform/backend/observation/intellij.platform.backend.observation.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/backend/observation-impl/intellij.platform.backend.observation.impl.iml" filepath="$PROJECT_DIR$/platform/backend/observation-impl/intellij.platform.backend.observation.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/backend/workspace/intellij.platform.backend.workspace.iml" filepath="$PROJECT_DIR$/platform/backend/workspace/intellij.platform.backend.workspace.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/platform-tests/benchmarks/intellij.platform.benchmarks.iml" filepath="$PROJECT_DIR$/platform/platform-tests/benchmarks/intellij.platform.benchmarks.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/boot/intellij.platform.boot.iml" filepath="$PROJECT_DIR$/platform/boot/intellij.platform.boot.iml" />

15
platform/backend/observation-impl/intellij.platform.backend.observation.impl.iml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="module" module-name="intellij.platform.backend.observation" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
</component>
</module>

3
platform/backend/observation-impl/src/com/intellij/platform/backend/observation/impl/Observation.kt → platform/backend/observation/src/com/intellij/platform/backend/observation/Observation.kt
View File

@@ -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 {

1
platform/platform-tests/intellij.platform.tests.iml
View File

@@ -84,6 +84,5 @@
<orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.instanceContainer" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.backend.observation" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.backend.observation.impl" scope="TEST" />
</component>
</module>

2
platform/platform-tests/testSrc/com/intellij/util/ActivityInProgressServiceTest.kt
View File

@@ -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

2
platform/warmup/intellij.platform.warmup.iml
View File

@@ -15,6 +15,6 @@
<orderEntry type="module" module-name="intellij.platform.ide" />
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
<orderEntry type="module" module-name="intellij.platform.backend.observation.impl" />
<orderEntry type="module" module-name="intellij.platform.backend.observation" />
</component>
</module>

2
platform/warmup/src/com/intellij/warmup/util/ProjectUtil.kt
View File

@@ -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