MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: use better file path for LightVirtualFile for non-local contents

Browse Source 
Make it consistent with MyBinaryLightVirtualFile
* to be used in "Copy Reference..." action
* to be used in $/FileRelativePath$ macro for External Tool.

GitOrigin-RevId: 08f1259ca70273cca2d8c61ee2df719a1906ff8c
This commit is contained in:
Aleksey Pivovarov
2020-04-29 15:55:59 +00:00
committed by intellij-monorepo-bot
parent ff3857d79a
commit 71ca0b2cb9
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/DiffContentFactoryImpl.java
+31 -10
View File
@@ -405,9 +405,9 @@ public class DiffContentFactoryImpl extends DiffContentFactoryEx {
private static Document createDocument(@Nullable Project project,
@NotNull String content,
@Nullable FileType fileType,
@Nullable @NonNls String fileName,
@NonNls @NotNull FilePath filePath,
boolean readOnly) {
Document document = createPsiDocument(project, content, fileType, fileName, readOnly);
Document document = createPsiDocument(project, content, fileType, filePath, readOnly);
if (document == null) {
document = EditorFactory.getInstance().createDocument(content);
document.setReadOnly(readOnly);
@@ -419,16 +419,12 @@ public class DiffContentFactoryImpl extends DiffContentFactoryEx {
private static Document createPsiDocument(@Nullable Project project,
@NotNull String content,
@Nullable FileType fileType,
@NonNls @Nullable String fileName,
@NonNls @NotNull FilePath filePath,
boolean readOnly) {
if (project == null || project.isDefault()) return null;
if (fileType == null || fileType.isBinary()) return null;
if (fileName == null) {
fileName = "diff." + StringUtil.defaultIfEmpty(fileType.getDefaultExtension(), "txt");
}
LightVirtualFile file = new LightVirtualFile(fileName, fileType, content);
LightVirtualFile file = new MyLightVirtualFile(filePath, fileType, content);
file.setWritable(!readOnly);
Document document = ReadAction.compute(() -> FileDocumentManager.getInstance().getDocument(file));
@@ -628,7 +624,17 @@ public class DiffContentFactoryImpl extends DiffContentFactoryEx {
@NotNull
private DocumentContent build(@NotNull TextContent textContent) {
FileType fileType = context != null ? context.getContentType() : null;
Document document = createDocument(project, textContent.text, fileType, fileName, readOnly);
FilePath filePath = originalFilePath;
if (filePath == null) {
String name = fileName;
if (name == null) {
name = "diff." + StringUtil.defaultIfEmpty(fileType != null ? fileType.getDefaultExtension() : null, "txt");
}
filePath = DiffVcsFacade.getInstance().getFilePath(name);
}
Document document = createDocument(project, textContent.text, fileType, filePath, readOnly);
DocumentContent documentContent = new ContextReferentDocumentContent(project, document, textContent, context);
@@ -649,10 +655,25 @@ public class DiffContentFactoryImpl extends DiffContentFactoryEx {
}
}
private static class MyLightVirtualFile extends LightVirtualFile {
private final FilePath myPath;
private MyLightVirtualFile(@NotNull FilePath path, @Nullable FileType fileType, @NotNull String content) {
super(path.getName(), fileType, content);
myPath = path;
}
@NotNull
@Override
public String getPath() {
return myPath.getPath();
}
}
private static class MyBinaryLightVirtualFile extends BinaryLightVirtualFile {
private final FilePath myPath;
MyBinaryLightVirtualFile(@NotNull FilePath path, FileType type, byte @NotNull [] content) {
MyBinaryLightVirtualFile(@NotNull FilePath path, @Nullable FileType type, byte @NotNull [] content) {
super(path.getName(), type, content);
myPath = path;
}