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

Revert "[platform] Do not use VirtualFilePointer in CompilerProjectExtension"

Browse Source 
This reverts commit bfe253cd71762b7b2f3b1231e2ffe1e0c1f443fa.

GitOrigin-RevId: e3536c974367e018fee2238292b031a0171571ac
This commit is contained in:
Konstantin Nisht
2024-08-01 11:59:31 +02:00
committed by intellij-monorepo-bot
parent 4a9f1b4fee
commit fefe6fbe44
3 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java
View File

@@ -15,12 +15,8 @@ import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.pointers.VirtualFilePointer;
import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
import com.intellij.platform.backend.workspace.VirtualFileUrls;
import com.intellij.platform.backend.workspace.WorkspaceModel;
import com.intellij.platform.workspace.storage.url.VirtualFileUrl;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.HashSet;
import java.util.Objects;
@@ -30,13 +26,8 @@ final class CompilerProjectExtensionImpl extends CompilerProjectExtension implem
private static final String OUTPUT_TAG = "output";
private static final String URL = "url";
private VirtualFileUrl myCompilerOutput;
private VirtualFilePointer myCompilerOutput;
private LocalFileSystem.WatchRequest myCompilerOutputWatchRequest;
private final Project myProject;
CompilerProjectExtensionImpl(@NotNull Project project) {
myProject = project;
}
/**
* Returns true if the compiler output was changed after read
@@ -45,8 +36,8 @@ final class CompilerProjectExtensionImpl extends CompilerProjectExtension implem
Element pathElement = element.getChild(OUTPUT_TAG);
if (pathElement != null) {
String outputPath = pathElement.getAttributeValue(URL);
VirtualFileUrl oldValue = myCompilerOutput;
myCompilerOutput = outputPath != null ? WorkspaceModel.getInstance(myProject).getVirtualFileUrlManager().getOrCreateFromUrl(outputPath) : null;
VirtualFilePointer oldValue = myCompilerOutput;
myCompilerOutput = outputPath != null ? VirtualFilePointerManager.getInstance().create(outputPath, this, null) : null;
return !Objects.equals(
oldValue != null ? oldValue.getUrl() : null,
@@ -71,7 +62,7 @@ final class CompilerProjectExtensionImpl extends CompilerProjectExtension implem
@Override
public VirtualFile getCompilerOutput() {
return myCompilerOutput != null ? VirtualFileUrls.getVirtualFile(myCompilerOutput) : null;
return myCompilerOutput != null ? myCompilerOutput.getFile() : null;
}
@Override
@@ -81,17 +72,17 @@ final class CompilerProjectExtensionImpl extends CompilerProjectExtension implem
@Override
public VirtualFilePointer getCompilerOutputPointer() {
return myCompilerOutput == null ? null : VirtualFilePointerManager.getInstance().create(myCompilerOutput.getUrl(), this, null);
return myCompilerOutput;
}
@Override
public void setCompilerOutputPointer(@Nullable VirtualFilePointer pointer) {
myCompilerOutput = pointer == null ? null : WorkspaceModel.getInstance(myProject).getVirtualFileUrlManager().getOrCreateFromUrl(pointer.getUrl());
public void setCompilerOutputPointer(VirtualFilePointer pointer) {
myCompilerOutput = pointer;
}
@Override
public void setCompilerOutputUrl(String compilerOutputUrl) {
VirtualFilePointer pointer = compilerOutputUrl == null ? null : VirtualFilePointerManager.getInstance().create(compilerOutputUrl, this, null);
VirtualFilePointer pointer = VirtualFilePointerManager.getInstance().create(compilerOutputUrl, this, null);
setCompilerOutputPointer(pointer);
String path = VfsUtilCore.urlToPath(compilerOutputUrl);
myCompilerOutputWatchRequest = LocalFileSystem.getInstance().replaceWatchedRoot(myCompilerOutputWatchRequest, path, true);