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: deprecate DiffVirtualFile

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

GitOrigin-RevId: 85166a99f37cf58d530dd948662d1ffbd6b71873
This commit is contained in:
Aleksey Pivovarov
2024-02-09 14:33:43 +00:00
committed by intellij-monorepo-bot
parent 4b60098bdc
commit b1a766997d
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java
-2
View File
@@ -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;
platform/diff-impl/src/com/intellij/diff/actions/impl/OpenDiffInEditorAction.java
+2 -2
View File
@@ -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);
}
}
platform/diff-impl/src/com/intellij/diff/editor/DiffEditorViewerFileEditor.kt
+3 -2
View File
@@ -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)
platform/diff-impl/src/com/intellij/diff/editor/DiffVirtualFile.kt
+2
View File
@@ -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)