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

diff: reduce CombinedDiff dependency on vcs-impl

Browse Source 
GitOrigin-RevId: 19e6eb51aa488e160179b02c7b4c1f3ad5105a6e
This commit is contained in:
Aleksey Pivovarov
2024-04-29 18:11:55 +02:00
committed by intellij-monorepo-bot
parent 672a4036aa
commit 8914f12ffd
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/diff-impl/resources/META-INF/diff-impl.xml
View File

@@ -3,5 +3,8 @@
<registryKey defaultValue="true"
description="Try to include navigation within a diff in the editor's navigation history."
key="include.diffs.in.navigation.history"/>
<diff.DiffTool implementation="com.intellij.diff.tools.combined.CombinedSideBySideDiffTool"/>
<diff.DiffTool implementation="com.intellij.diff.tools.combined.CombinedUnifiedDiffTool"/>
</extensions>
</idea-plugin>

3
platform/diff-impl/src/com/intellij/diff/tools/combined/CombinedDiffTool.kt
View File

@@ -5,7 +5,6 @@ import com.intellij.diff.DiffContext
import com.intellij.diff.DiffTool
import com.intellij.diff.requests.DiffRequest
import com.intellij.openapi.diff.DiffBundle
import com.intellij.openapi.extensions.InternalIgnoreDependencyViolation
internal interface CombinedDiffTool : DiffTool
@@ -13,7 +12,6 @@ internal interface CombinedDiffTool : DiffTool
* This tool intended only for persistence purpose.
* Combined diff viewer will be created by the corresponding [CombinedDiffComponentProcessor].
*/
@InternalIgnoreDependencyViolation
private class CombinedSideBySideDiffTool : CombinedDiffTool {
override fun canShow(context: DiffContext, request: DiffRequest): Boolean = false
@@ -24,7 +22,6 @@ private class CombinedSideBySideDiffTool : CombinedDiffTool {
* This tool intended only for persistence purpose.
* Combined diff viewer will be created by the corresponding [CombinedDiffComponentProcessor].
*/
@InternalIgnoreDependencyViolation
internal class CombinedUnifiedDiffTool : CombinedDiffTool {
override fun canShow(context: DiffContext, request: DiffRequest): Boolean = false

2
platform/vcs-impl/resources/META-INF/VcsExtensions.xml
View File

@@ -73,8 +73,6 @@
<diff.DiffTool implementation="com.intellij.openapi.vcs.changes.patch.tool.ApplyPatchDiffTool"/>
<diff.DiffTool implementation="com.intellij.openapi.vcs.changes.patch.tool.PatchDiffTool$Unified"/>
<diff.DiffTool implementation="com.intellij.openapi.vcs.changes.patch.tool.PatchDiffTool$SideBySide"/>
<diff.DiffTool implementation="com.intellij.diff.tools.combined.CombinedSideBySideDiffTool"/>
<diff.DiffTool implementation="com.intellij.diff.tools.combined.CombinedUnifiedDiffTool"/>
<diff.impl.DiffToolSubstitutor implementation="com.intellij.openapi.vcs.changes.actions.diff.lst.LocalChangeListDiffTool$Simple"/>
<diff.impl.DiffToolSubstitutor implementation="com.intellij.openapi.vcs.changes.actions.diff.lst.LocalChangeListDiffTool$Unified"/>
<projectService serviceInterface="com.intellij.diff.tools.combined.search.CombinedDiffSearchProvider"