From ca003c1aa09e12929b0351ed12bc15f28ca36c6c Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Sat, 30 Aug 2025 00:09:36 +0400 Subject: [PATCH] add VIRTUAL_FILE_ARRAY to TextEditorHolder UI snapshot To override the value provided by EditorComposite. Fixes IJPL-196228 (cherry picked from commit 7b8dde8b64f2682a57933ea2a966b8b7aa056e4d) IJ-CR-174082 GitOrigin-RevId: 00fbc1887adf9ae3e0f4b7b719ca979695879157 --- .../com/intellij/diff/tools/holders/TextEditorHolder.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/diff-impl/src/com/intellij/diff/tools/holders/TextEditorHolder.java b/platform/diff-impl/src/com/intellij/diff/tools/holders/TextEditorHolder.java index be8123444ff9..529d43133c0c 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/holders/TextEditorHolder.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/holders/TextEditorHolder.java @@ -14,6 +14,7 @@ import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider; import com.intellij.openapi.project.Project; +import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.components.panels.Wrapper; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -100,7 +101,11 @@ public class TextEditorHolder extends EditorHolder { sink.set(CommonDataKeys.PROJECT, project); sink.set(OpenFileDescriptor.NAVIGATE_IN_EDITOR, editor); sink.set(CommonDataKeys.EDITOR, editor); - sink.set(CommonDataKeys.VIRTUAL_FILE, editor.getVirtualFile()); + VirtualFile virtualFile = editor.getVirtualFile(); + if (virtualFile != null) { + sink.set(CommonDataKeys.VIRTUAL_FILE, virtualFile); + sink.set(CommonDataKeys.VIRTUAL_FILE_ARRAY, new VirtualFile[]{virtualFile}); + } sink.set(PlatformCoreDataKeys.FILE_EDITOR, TextEditorProvider.getInstance().getTextEditor(editor)); }