MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[workspace model] IJPL-797 intellij.platform.projectModel review internal API (workspaceModel package)

Browse Source 
GitOrigin-RevId: f50f4cea39cfefecf13832d6ef468668ad0f7d60
This commit is contained in:
Mikhail Mazurkevich
2024-06-18 17:26:17 +04:00
committed by intellij-monorepo-bot
parent 9b9073a084
commit a3ddcc63a5
11 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/openapi/src/com/intellij/java/workspace/files/JavaSourceFiles.kt
View File

@@ -8,7 +8,7 @@ import com.intellij.openapi.vfs.VirtualFile
import com.intellij.platform.backend.workspace.virtualFile
import com.intellij.platform.workspace.jps.entities.ModuleEntity
import com.intellij.platform.workspace.jps.entities.sourceRoots
import com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry
import com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry
/**
* Return a file located under the source or resource roots of this module which will be copied to the production output with [relativePath].

22
platform/projectModel-api/api-dump-unreviewed.txt
View File

@@ -1190,21 +1190,9 @@ a:com.intellij.openapi.roots.libraries.PersistentLibraryKind
f:com.intellij.projectModel.ProjectModelBundle
- s:message(java.lang.String,java.lang.Object[]):java.lang.String
- s:messagePointer(java.lang.String,java.lang.Object[]):java.util.function.Supplier
com.intellij.workspaceModel.ide.EntitiesOrphanage
- sf:Companion:com.intellij.workspaceModel.ide.EntitiesOrphanage$Companion
- a:getCurrentSnapshot():com.intellij.platform.workspace.storage.ImmutableEntityStorage
- a:update(kotlin.jvm.functions.Function1):V
f:com.intellij.workspaceModel.ide.EntitiesOrphanage$Companion
- f:getInstance(com.intellij.openapi.project.Project):com.intellij.workspaceModel.ide.EntitiesOrphanage
com.intellij.workspaceModel.ide.JpsProjectLoadingManager
- sf:Companion:com.intellij.workspaceModel.ide.JpsProjectLoadingManager$Companion
- s:getInstance(com.intellij.openapi.project.Project):com.intellij.workspaceModel.ide.JpsProjectLoadingManager
- a:jpsProjectLoaded(java.lang.Runnable):V
f:com.intellij.workspaceModel.ide.JpsProjectLoadingManager$Companion
- f:getInstance(com.intellij.openapi.project.Project):com.intellij.workspaceModel.ide.JpsProjectLoadingManager
com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry
- sf:Companion:com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry$Companion
com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry
- sf:Companion:com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry$Companion
- a:findTypeById(com.intellij.platform.workspace.jps.entities.SourceRootTypeId):org.jetbrains.jps.model.module.JpsModuleSourceRootType
- s:getInstance():com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry
f:com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry$Companion
- f:getInstance():com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry
- s:getInstance():com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry
f:com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry$Companion
- f:getInstance():com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry

2
platform/projectModel-api/src/com/intellij/workspaceModel/ide/EntitiesOrphanage.kt
View File

@@ -8,6 +8,7 @@ import com.intellij.platform.workspace.jps.entities.ModuleEntity
import com.intellij.platform.workspace.storage.ImmutableEntityStorage
import com.intellij.platform.workspace.storage.MutableEntityStorage
import com.intellij.util.concurrency.annotations.RequiresWriteLock
import org.jetbrains.annotations.ApiStatus
/**
* Orphanage - storage that contains content roots/source roots/excludes that currently don't have an associated parent in the storage.
@@ -30,6 +31,7 @@ import com.intellij.util.concurrency.annotations.RequiresWriteLock
* - If we create a custom *source root*, the created content root has [com.intellij.platform.workspace.jps.OrphanageWorkerEntitySource] entity source in orphan storage and
* have `dumb="true"` tag in iml file.
*/
@ApiStatus.Internal
interface EntitiesOrphanage {
val currentSnapshot: ImmutableEntityStorage

2
platform/projectModel-api/src/com/intellij/workspaceModel/ide/JpsProjectLoadingManager.kt
View File

@@ -3,12 +3,14 @@ package com.intellij.workspaceModel.ide
import com.intellij.openapi.components.service
import com.intellij.openapi.project.Project
import org.jetbrains.annotations.ApiStatus
/**
* Discussion about this manager: IDEA-330045
*
* If possible, try not to use this manager as it's related to the JPS model, and we may try to get rid of JPS in non-IJ IDEs in the future.
*/
@ApiStatus.Internal
interface JpsProjectLoadingManager {
/**
* Schedule a task that should be executed after a JPS project model will be loaded.

2
platform/projectModel-api/src/com/intellij/workspaceModel/ide/legacyBridge/sdk/SourceRootTypeRegistry.kt → platform/projectModel-api/src/com/intellij/workspaceModel/ide/legacyBridge/SourceRootTypeRegistry.kt
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.workspaceModel.ide.legacyBridge.sdk
package com.intellij.workspaceModel.ide.legacyBridge
import com.intellij.openapi.application.ApplicationManager
import com.intellij.platform.workspace.jps.entities.SourceRootTypeId

2
platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml
View File

@@ -27,7 +27,7 @@
serviceImplementation="com.intellij.openapi.project.ProjectLocatorImpl"/>
<applicationService serviceInterface="com.intellij.openapi.roots.libraries.LibraryTablesRegistrar"
serviceImplementation="com.intellij.openapi.roots.impl.libraries.LibraryTablesRegistrarImpl"/>
<applicationService serviceInterface="com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry"
<applicationService serviceInterface="com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry"
serviceImplementation="com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.SourceRootTypeRegistryImpl"/>
<!-- Global Workspace Model -->
<applicationService serviceInterface="com.intellij.workspaceModel.ide.JpsGlobalModelSynchronizer"

2
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexImpl.java
View File

@@ -14,7 +14,7 @@ import com.intellij.workspaceModel.core.fileIndex.WorkspaceFileKind;
import com.intellij.workspaceModel.core.fileIndex.WorkspaceFileSet;
import com.intellij.workspaceModel.core.fileIndex.WorkspaceFileSetWithCustomData;
import com.intellij.workspaceModel.core.fileIndex.impl.*;
import com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry;
import com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry;
import kotlin.Pair;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;

2
platform/projectModel-impl/src/com/intellij/workspaceModel/core/fileIndex/impl/WorkspaceFileSetRecognizer.kt
View File

@@ -12,7 +12,7 @@ import com.intellij.util.asSafely
import com.intellij.workspaceModel.core.fileIndex.WorkspaceFileKind
import com.intellij.workspaceModel.core.fileIndex.WorkspaceFileSet
import com.intellij.workspaceModel.core.fileIndex.WorkspaceFileSetWithCustomData
import com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry
import com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry
import org.jetbrains.jps.model.JpsElement
import org.jetbrains.jps.model.module.JpsModuleSourceRootType

2
platform/projectModel-impl/src/com/intellij/workspaceModel/core/fileIndex/impl/moduleRootContributors.kt
View File

@@ -14,7 +14,7 @@ import com.intellij.platform.workspace.jps.entities.SourceRootTypeId
import com.intellij.platform.workspace.storage.EntityStorage
import com.intellij.workspaceModel.core.fileIndex.*
import com.intellij.workspaceModel.ide.impl.legacyBridge.module.findModule
import com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry
import com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry
import org.jetbrains.annotations.ApiStatus
class ContentRootFileIndexContributor : WorkspaceFileIndexContributor<ContentRootEntity>, PlatformInternalWorkspaceFileIndexContributor {

2
platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/ContentFolderBridge.kt
View File

@@ -12,7 +12,7 @@ import com.intellij.platform.workspace.jps.entities.SourceRootEntity
import com.intellij.platform.workspace.jps.entities.customSourceRootProperties
import com.intellij.platform.workspace.jps.entities.modifySourceRootEntity
import com.intellij.platform.workspace.storage.url.VirtualFileUrl
import com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry
import com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry
import org.jetbrains.jps.model.JpsElement
import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes
import org.jetbrains.jps.model.module.JpsModuleSourceRoot

2
platform/projectModel-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/roots/SourceRootTypeRegistryImpl.kt
View File

@@ -2,7 +2,7 @@
package com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots
import com.intellij.platform.workspace.jps.entities.SourceRootTypeId
import com.intellij.workspaceModel.ide.legacyBridge.sdk.SourceRootTypeRegistry
import com.intellij.workspaceModel.ide.legacyBridge.SourceRootTypeRegistry
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.jps.model.module.JpsModuleSourceRootType
import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension