From b1a766997dd6f421f5456857432fb19ffcd72bf6 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Fri, 9 Feb 2024 12:59:10 +0100
Subject: [PATCH] diff: deprecate DiffVirtualFile

The platform usages are kept back to keep compatibility with plugins that cast to it.

GitOrigin-RevId: 85166a99f37cf58d530dd948662d1ffbd6b71873
---
 .../src/com/intellij/diff/actions/BaseShowDiffAction.java    | 2 --
 .../intellij/diff/actions/impl/OpenDiffInEditorAction.java   | 4 ++--
 .../com/intellij/diff/editor/DiffEditorViewerFileEditor.kt   | 5 +++--
 .../src/com/intellij/diff/editor/DiffVirtualFile.kt          | 2 ++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java b/platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java
index 15939cbe7462..ff40c3023d0d 100644
--- a/platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java
+++ b/platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java
@@ -23,7 +23,6 @@ import com.intellij.diff.actions.impl.MutableDiffRequestChain;
 import com.intellij.diff.chains.DiffRequestChain;
 import com.intellij.diff.contents.DiffContent;
 import com.intellij.diff.contents.DocumentContent;
-import com.intellij.diff.editor.DiffVirtualFile;
 import com.intellij.diff.util.DiffUtil;
 import com.intellij.openapi.actionSystem.ActionPlaces;
 import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -31,7 +30,6 @@ import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileWithoutContent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenDiffInEditorAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenDiffInEditorAction.java
index 09400320bdf8..a6b0eb9252d5 100644
--- a/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenDiffInEditorAction.java
+++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenDiffInEditorAction.java
@@ -1,7 +1,6 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.diff.actions.impl;
 
-import com.intellij.diff.editor.DiffVirtualFile;
 import com.intellij.diff.editor.SimpleDiffVirtualFile;
 import com.intellij.diff.requests.DiffRequest;
 import com.intellij.diff.tools.util.DiffDataKeys;
@@ -11,6 +10,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 
 public class OpenDiffInEditorAction extends DumbAwareAction {
@@ -32,7 +32,7 @@ public class OpenDiffInEditorAction extends DumbAwareAction {
     Project project = e.getRequiredData(CommonDataKeys.PROJECT);
     DiffRequest request = e.getRequiredData(DiffDataKeys.DIFF_REQUEST);
 
-    DiffVirtualFile file = new SimpleDiffVirtualFile(request);
+    VirtualFile file = new SimpleDiffVirtualFile(request);
     FileEditorManager.getInstance(project).openFile(file, true);
   }
 }
diff --git a/platform/diff-impl/src/com/intellij/diff/editor/DiffEditorViewerFileEditor.kt b/platform/diff-impl/src/com/intellij/diff/editor/DiffEditorViewerFileEditor.kt
index 4f6120c52959..d4648ab2f8ab 100644
--- a/platform/diff-impl/src/com/intellij/diff/editor/DiffEditorViewerFileEditor.kt
+++ b/platform/diff-impl/src/com/intellij/diff/editor/DiffEditorViewerFileEditor.kt
@@ -87,8 +87,9 @@ open class DiffEditorViewerFileEditor(
   }
 }
 
-@Deprecated("Use DiffEditorViewerFileEditors instead")
+@Deprecated("Use DiffEditorViewerFileEditors instead", replaceWith = ReplaceWith("DiffEditorViewerFileEditor"))
 open class DiffRequestProcessorEditor(
   file: VirtualFile,
-  @Deprecated("use editorViewer instead") val processor: DiffRequestProcessor
+  @Deprecated("use editorViewer instead", replaceWith = ReplaceWith("editorViewer"))
+  val processor: DiffRequestProcessor
 ) : DiffEditorViewerFileEditor(file, processor)
diff --git a/platform/diff-impl/src/com/intellij/diff/editor/DiffVirtualFile.kt b/platform/diff-impl/src/com/intellij/diff/editor/DiffVirtualFile.kt
index 90a607ddf7d6..30d31a550ede 100644
--- a/platform/diff-impl/src/com/intellij/diff/editor/DiffVirtualFile.kt
+++ b/platform/diff-impl/src/com/intellij/diff/editor/DiffVirtualFile.kt
@@ -5,8 +5,10 @@ import com.intellij.diff.impl.DiffEditorViewer
 import com.intellij.diff.impl.DiffRequestProcessor
 import com.intellij.openapi.project.Project
 
+@Deprecated("Use DiffViewerVirtualFile instead", replaceWith = ReplaceWith("DiffViewerVirtualFile"))
 abstract class DiffVirtualFile(name: String) : DiffViewerVirtualFile(name) {
 
+  @Deprecated("Use createViewer instead", replaceWith = ReplaceWith("createViewer"))
   abstract fun createProcessor(project: Project): DiffRequestProcessor
 
   override fun createViewer(project: Project): DiffEditorViewer = createProcessor(project)