[VCS]: Diff Toolbar: New diff type selector IJPL-240828

dustybluebird · intellij-monorepo-bot · commit f85d694ef721 · 2026-05-12T18:08:35.000Z
GitOrigin-RevId: e9924c53695dabfb93096dff5116a3afedce420d
diff --git a/platform/diff-api/api-dump.txt b/platform/diff-api/api-dump.txt
@@ -139,6 +139,7 @@ com.intellij.diff.FocusableContext
 com.intellij.diff.FrameDiffTool
 - com.intellij.diff.DiffTool
 - a:createComponent(com.intellij.diff.DiffContext,com.intellij.diff.requests.DiffRequest):com.intellij.diff.FrameDiffTool$DiffViewer
+- getIcon():javax.swing.Icon
 - getToolType():com.intellij.diff.DiffToolType
 com.intellij.diff.FrameDiffTool$DiffViewer
 - com.intellij.openapi.Disposable
diff --git a/platform/diff-api/src/com/intellij/diff/FrameDiffTool.java b/platform/diff-api/src/com/intellij/diff/FrameDiffTool.java
@@ -1,14 +1,16 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.diff;
 
 import com.intellij.diff.requests.DiffRequest;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.util.concurrency.annotations.RequiresEdt;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.Icon;
 import javax.swing.JComponent;
 import java.util.List;
 
@@ -25,6 +27,12 @@ public interface FrameDiffTool extends DiffTool {
   @NotNull
   DiffViewer createComponent(@NotNull DiffContext context, @NotNull DiffRequest request);
 
+  default @NotNull Icon getIcon() {
+    return getToolType() == DiffToolType.Unified.INSTANCE
+           ? AllIcons.Diff.Unified
+           : AllIcons.Diff.SideBySide;
+  }
+
   default @NotNull DiffToolType getToolType() {
     return DiffToolType.Default.INSTANCE;
   }
diff --git a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.diff.impl;
 
 import com.intellij.codeInsight.hint.HintManager;
@@ -934,7 +934,13 @@ public void onSelected(@NotNull Project project, @NotNull DiffTool diffTool) {
 
     @Override
     public @NotNull DiffTool getActiveTool() {
-      return myState.getActiveTool();
+      DiffTool activeTool = myState.getActiveTool();
+      for (DiffTool tool : getTools()) {
+        if (isSameToolOrSubstitutor(tool, activeTool, myContext, myActiveRequest)) {
+          return tool;
+        }
+      }
+      return activeTool;
     }
 
     @Override
@@ -944,7 +950,6 @@ public void onSelected(@NotNull Project project, @NotNull DiffTool diffTool) {
   }
 
   private class MyChangeDiffToolComboBoxAction extends ComboBoxAction implements DumbAware {
-    // TODO: add icons for diff tools, show only icon in toolbar - to reduce jumping on change ?
     @Override
     public @NotNull ActionUpdateThread getActionUpdateThread() {
       return ActionUpdateThread.BGT;
diff --git a/platform/diff-impl/src/com/intellij/diff/impl/ui/DiffToolChooser.kt b/platform/diff-impl/src/com/intellij/diff/impl/ui/DiffToolChooser.kt
@@ -1,7 +1,9 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.diff.impl.ui
 
 import com.intellij.diff.DiffTool
+import com.intellij.diff.FrameDiffTool
+import com.intellij.diff.tools.combined.CombinedDiffTool
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.Presentation
@@ -18,7 +20,17 @@ import javax.swing.JComponent
 @ApiStatus.Experimental
 @Suppress("DialogTitleCapitalization")
 abstract class DiffToolChooser(private val project: Project?) : DumbAwareAction(), CustomComponentAction {
-  private val segmentedButton = SegmentedButtonComponent { diffTool: DiffTool -> SegmentedButton.createPresentation(text = diffTool.name) }
+  private val segmentedButton = SegmentedButtonComponent { diffTool: DiffTool ->
+    val icon = when (diffTool) {
+      is FrameDiffTool -> diffTool.icon
+      is CombinedDiffTool -> diffTool.getIcon()
+      else -> null
+    }
+    if (icon != null)
+      SegmentedButton.createPresentation(icon = icon, toolTipText = diffTool.name)
+    else
+      SegmentedButton.createPresentation(text = diffTool.name)
+  }
 
   override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.EDT
 
@@ -61,4 +73,3 @@ abstract class DiffToolChooser(private val project: Project?) : DumbAwareAction(
     return segmentedButton
   }
 }
-
diff --git a/platform/diff-impl/src/com/intellij/diff/tools/combined/CombinedDiffTool.kt b/platform/diff-impl/src/com/intellij/diff/tools/combined/CombinedDiffTool.kt
@@ -1,14 +1,18 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.diff.tools.combined
 
 import com.intellij.diff.DiffContext
 import com.intellij.diff.DiffTool
 import com.intellij.diff.requests.DiffRequest
+import com.intellij.icons.AllIcons
 import com.intellij.openapi.diff.DiffBundle
 import org.jetbrains.annotations.ApiStatus
+import javax.swing.Icon
 
 @ApiStatus.Experimental
-internal interface CombinedDiffTool : DiffTool
+internal interface CombinedDiffTool : DiffTool {
+  fun getIcon(): Icon
+}
 
 /**
  * This tool intended only for persistence purpose.
@@ -18,6 +22,8 @@ internal class CombinedSideBySideDiffTool : CombinedDiffTool {
   override fun canShow(context: DiffContext, request: DiffRequest): Boolean = false
 
   override fun getName(): String = DiffBundle.message("combined.side.by.side.viewer")
+
+  override fun getIcon(): Icon = AllIcons.Diff.SideBySide
 }
 
 /**
@@ -28,4 +34,6 @@ internal class CombinedUnifiedDiffTool : CombinedDiffTool {
   override fun canShow(context: DiffContext, request: DiffRequest): Boolean = false
 
   override fun getName(): String = DiffBundle.message("combined.unified.viewer")
+
+  override fun getIcon(): Icon = AllIcons.Diff.Unified
 }
diff --git a/platform/icons/src/expui/diff/sideBySide.svg b/platform/icons/src/expui/diff/sideBySide.svg
@@ -0,0 +1,6 @@
+<!-- Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd"
+        d="M8.5 3H12C12.5523 3 13 3.44772 13 4V12C13 12.5523 12.5523 13 12 13H8.5V3ZM7.5 2H8.5H12C13.1046 2 14 2.89543 14 4V12C14 13.1046 13.1046 14 12 14H8.5H7.5H4C2.89543 14 2 13.1046 2 12V4C2 2.89543 2.89543 2 4 2H7.5ZM7.5 13H4C3.44772 13 3 12.5523 3 12V4C3 3.44772 3.44772 3 4 3H7.5V13Z"
+        fill="#6C707E"/>
+</svg>
diff --git a/platform/icons/src/expui/diff/sideBySide_dark.svg b/platform/icons/src/expui/diff/sideBySide_dark.svg
@@ -0,0 +1,6 @@
+<!-- Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd"
+        d="M8.5 3H12C12.5523 3 13 3.44772 13 4V12C13 12.5523 12.5523 13 12 13H8.5V3ZM7.5 2H8.5H12C13.1046 2 14 2.89543 14 4V12C14 13.1046 13.1046 14 12 14H8.5H7.5H4C2.89543 14 2 13.1046 2 12V4C2 2.89543 2.89543 2 4 2H7.5ZM7.5 13H4C3.44772 13 3 12.5523 3 12V4C3 3.44772 3.44772 3 4 3H7.5V13Z"
+        fill="#CED0D6"/>
+</svg>
diff --git a/platform/icons/src/expui/diff/unified.svg b/platform/icons/src/expui/diff/unified.svg
@@ -0,0 +1,6 @@
+<!-- Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M12.204 2.011C13.213 2.113 14 2.964 14 4V12L13.989 12.204C13.894 13.146 13.146 13.894 12.204 13.989L12 14H4C2.964 14 2.113 13.213 2.011 12.204L2 12V4C2 2.895 2.895 2 4 2H12L12.204 2.011ZM4 3C3.448 3 3 3.448 3 4V12C3 12.552 3.448 13 4 13H12C12.552 13 13 12.552 13 12V4C13 3.448 12.552 3 12 3H4Z"
+    fill="#6C707E" color-fill-key="icon-default-stroke"/>
+</svg>
diff --git a/platform/icons/src/expui/diff/unified_dark.svg b/platform/icons/src/expui/diff/unified_dark.svg
@@ -0,0 +1,6 @@
+<!-- Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M12.204 2.011C13.213 2.113 14 2.964 14 4V12L13.989 12.204C13.894 13.146 13.146 13.894 12.204 13.989L12 14H4C2.964 14 2.113 13.213 2.011 12.204L2 12V4C2 2.895 2.895 2 4 2H12L12.204 2.011ZM4 3C3.448 3 3 3.448 3 4V12C3 12.552 3.448 13 4 13H12C12.552 13 13 12.552 13 12V4C13 3.448 12.552 3 12 3H4Z"
+    fill="#CED0D6" color-fill-key="icon-default-stroke"/>
+</svg>
diff --git a/platform/jewel/ui/api-dump.txt b/platform/jewel/ui/api-dump.txt
@@ -2885,6 +2885,8 @@ f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Diff
 - sf:MagicResolveToolbar:org.jetbrains.jewel.ui.icon.IntelliJIconKey
 - sf:Remove:org.jetbrains.jewel.ui.icon.IntelliJIconKey
 - sf:Revert:org.jetbrains.jewel.ui.icon.IntelliJIconKey
+- sf:SideBySide:org.jetbrains.jewel.ui.icon.IntelliJIconKey
+- sf:Unified:org.jetbrains.jewel.ui.icon.IntelliJIconKey
 - <init>():V
 f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Duplicates
 - sf:SendToTheLeft:org.jetbrains.jewel.ui.icon.IntelliJIconKey
diff --git a/platform/jewel/ui/generated/org/jetbrains/jewel/ui/icons/AllIconsKeys.java b/platform/jewel/ui/generated/org/jetbrains/jewel/ui/icons/AllIconsKeys.java
@@ -1229,6 +1229,12 @@ public static final class Diff {
     /** 12x12 */ 
     @GeneratedFromIntelliJSources
     public static final @NotNull IntelliJIconKey Revert = new IntelliJIconKey("diff/revert.svg", "expui/diff/revert@14x14.svg", AllIconsKeys.class);
+    /** 16x16 */ 
+    @GeneratedFromIntelliJSources
+    public static final @NotNull IntelliJIconKey SideBySide = new IntelliJIconKey("expui/diff/sideBySide.svg", "expui/diff/sideBySide.svg", AllIconsKeys.class);
+    /** 16x16 */ 
+    @GeneratedFromIntelliJSources
+    public static final @NotNull IntelliJIconKey Unified = new IntelliJIconKey("expui/diff/unified.svg", "expui/diff/unified.svg", AllIconsKeys.class);
   }
 
   @GeneratedFromIntelliJSources
diff --git a/platform/util/ui/api-dump.txt b/platform/util/ui/api-dump.txt
@@ -409,6 +409,8 @@ f:com.intellij.icons.AllIcons$Diff
 - sf:MagicResolveToolbar:javax.swing.Icon
 - sf:Remove:javax.swing.Icon
 - sf:Revert:javax.swing.Icon
+- sf:SideBySide:javax.swing.Icon
+- sf:Unified:javax.swing.Icon
 - <init>():V
 f:com.intellij.icons.AllIcons$Duplicates
 - sf:SendToTheLeft:javax.swing.Icon
diff --git a/platform/util/ui/src/com/intellij/icons/AllIcons.java b/platform/util/ui/src/com/intellij/icons/AllIcons.java
@@ -446,6 +446,8 @@ public static final class Diff {
     /** 16x16 */ public static final @NotNull Icon MagicResolveToolbar = load("expui/diff/magicResolveToolbar.svg", "diff/magicResolveToolbar.svg", 485340428, 2);
     /** 12x12 */ public static final @NotNull Icon Remove = load("expui/diff/remove@14x14.svg", "diff/remove.svg", 1317117219, 2);
     /** 12x12 */ public static final @NotNull Icon Revert = load("expui/diff/revert@14x14.svg", "diff/revert.svg", -889517433, 2);
+    /** 16x16 */ public static final @NotNull Icon SideBySide = load("expui/diff/sideBySide.svg", 1504631767, 2);
+    /** 16x16 */ public static final @NotNull Icon Unified = load("expui/diff/unified.svg", 1282318432, 2);
   }
 
   public static final class Duplicates {
