MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 08:51:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

[workspace model] IJPL-345 Rename VirtualFileUrlManager#fromUrl to VirtualFileUrlManager.getOrCreateFromUri

Browse Source 
GitOrigin-RevId: 810c3ce308c902ea4e1acf479a0b781ce45b34bc
This commit is contained in:
Mikhail Mazurkevich
2024-01-23 12:09:15 +04:00
committed by intellij-monorepo-bot
parent 5dc4732274
commit 8101439d4a
82 changed files with 361 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/ArtifactBridge.kt
View File

@@ -28,7 +28,6 @@ import com.intellij.platform.workspace.storage.impl.VersionedEntityStorageOnBuil
import com.intellij.platform.workspace.storage.url.VirtualFileUrlManager
import com.intellij.util.EventDispatcher
import com.intellij.workspaceModel.ide.getInstance
import com.intellij.workspaceModel.ide.impl.WorkspaceModelImpl
import com.intellij.workspaceModel.ide.toExternalSource
import io.opentelemetry.api.metrics.Meter
import org.jetbrains.annotations.NonNls
@@ -175,7 +174,7 @@ open class ArtifactBridge(
}
override fun setOutputPath(outputPath: String?) {
val outputUrl = outputPath?.let { VirtualFileUrlManager.getInstance(project).fromUrl(VfsUtilCore.pathToUrl(it)) }
val outputUrl = outputPath?.let { VirtualFileUrlManager.getInstance(project).getOrCreateFromUri(VfsUtilCore.pathToUrl(it)) }
val entity = diff.get(artifactId)
diff.modifyEntity(entity) {
this.outputUrl = outputUrl

3
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/workspacemodel/ArtifactModifiableModelBridge.kt
View File

@@ -34,7 +34,6 @@ import com.intellij.util.containers.mapInPlace
import com.intellij.util.text.UniqueNameGenerator
import com.intellij.workspaceModel.ide.getInstance
import com.intellij.workspaceModel.ide.impl.LegacyBridgeJpsEntitySourceFactory
import com.intellij.workspaceModel.ide.impl.WorkspaceModelImpl
import io.opentelemetry.api.metrics.Meter
import java.util.concurrent.atomic.AtomicLong
@@ -143,7 +142,7 @@ class ArtifactModifiableModelBridge(
}
}
val outputUrl = outputPath?.let { fileManager.fromUrl(VfsUtilCore.pathToUrl(it)) }
val outputUrl = outputPath?.let { fileManager.getOrCreateFromUri(VfsUtilCore.pathToUrl(it)) }
val artifactEntity = diff addEntity ArtifactEntity(uniqueName, artifactType.id, false, source) {
this.outputUrl = outputUrl
this.rootElement = rootElementEntity

2
java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryCopyPackagingElement.java
View File

@@ -43,7 +43,7 @@ public class DirectoryCopyPackagingElement extends FileOrDirectoryCopyPackagingE
VirtualFileUrlManager fileUrlManager = VirtualFileUrls.getVirtualFileUrlManager(project);
Objects.requireNonNull(myFilePath, "filePath is not specified");
VirtualFileUrl fileUrl = fileUrlManager.fromUrl(VfsUtilCore.pathToUrl(myFilePath));
VirtualFileUrl fileUrl = fileUrlManager.getOrCreateFromUri(VfsUtilCore.pathToUrl(myFilePath));
DirectoryCopyPackagingElementEntity addedEntity = diff.addEntity(DirectoryCopyPackagingElementEntity.create(fileUrl, source));
diff.getMutableExternalMapping(PackagingExternalMapping.key).addMapping(addedEntity, this);
return addedEntity;

2
java/compiler/impl/src/com/intellij/packaging/impl/elements/ExtractedDirectoryPackagingElement.java
View File

@@ -110,7 +110,7 @@ public class ExtractedDirectoryPackagingElement extends FileOrDirectoryCopyPacka
VirtualFileUrlManager fileUrlManager = VirtualFileUrls.getVirtualFileUrlManager(project);
Objects.requireNonNull(this.myFilePath, "filePath is not specified");
Objects.requireNonNull(this.myPathInJar, "pathInJar is not specified");
VirtualFileUrl fileUrl = fileUrlManager.fromUrl(VfsUtilCore.pathToUrl(this.myFilePath));
VirtualFileUrl fileUrl = fileUrlManager.getOrCreateFromUri(VfsUtilCore.pathToUrl(this.myFilePath));
ExtractedDirectoryPackagingElementEntity addedEntity = diff.addEntity(ExtractedDirectoryPackagingElementEntity.create(fileUrl, this.myPathInJar, source));
diff.getMutableExternalMapping(PackagingExternalMapping.key).addMapping(addedEntity, this);

2
java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyPackagingElement.java
View File

@@ -148,7 +148,7 @@ public class FileCopyPackagingElement extends FileOrDirectoryCopyPackagingElemen
Objects.requireNonNull(filePath, "filePath is not specified");
FileCopyPackagingElementEntity addedEntity;
VirtualFileUrlManager fileUrlManager = VirtualFileUrls.getVirtualFileUrlManager(project);
VirtualFileUrl fileUrl = fileUrlManager.fromUrl(VfsUtilCore.pathToUrl(filePath));
VirtualFileUrl fileUrl = fileUrlManager.getOrCreateFromUri(VfsUtilCore.pathToUrl(filePath));
if (renamedOutputFileName != null) {
addedEntity = diff.addEntity(FileCopyPackagingElementEntity.create(fileUrl, source, entityBuilder -> {
entityBuilder.setRenamedOutputFileName(renamedOutputFileName);

2
java/compiler/impl/src/com/intellij/packaging/impl/elements/FileOrDirectoryCopyPackagingElement.java
View File

@@ -75,7 +75,7 @@ public abstract class FileOrDirectoryCopyPackagingElement<T extends FileOrDirect
builder.modifyEntity(FileOrDirectoryPackagingElementEntity.Builder.class, entity, ent -> {
VirtualFileUrlManager manager = VirtualFileUrls.getVirtualFileUrlManager(myProject);
if (filePath != null) {
VirtualFileUrl fileUrl = manager.fromUrl(VfsUtilCore.pathToUrl(filePath));
VirtualFileUrl fileUrl = manager.getOrCreateFromUri(VfsUtilCore.pathToUrl(filePath));
ent.setFilePath(fileUrl);
}
else {