From 5783b82dea162793d54bef1501685732f55ec1a0 Mon Sep 17 00:00:00 2001
From: raghucssit <raghucssit@gmail.com>
Date: Thu, 26 Jun 2025 13:38:34 +0200
Subject: [PATCH] Disable Toggle Instruction Step Mode command using activity
 support.

TISM command is always visible if the CDT Debug UI plug-in is not loaded
yet. This happened due to platform limitation.So handle visibility using
activity support.

see https://github.com/eclipse-cdt/cdt/issues/1220
---
 .../plugin.properties                         |  7 ++++
 debug/org.eclipse.cdt.debug.ui/plugin.xml     | 32 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.properties b/debug/org.eclipse.cdt.debug.ui/plugin.properties
index db3a7db9168..67e8b8df04d 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.properties
@@ -282,3 +282,10 @@ popup.stepIntoSelection.name=Step Into Selection
 DebuggerConsoleView.name=Debugger Console
 
 GenericTarget.name=Generic Target
+
+# Toggle Instruction Step Mode Command Activity support
+org.eclipse.cdt.debug.ui.category.name=C/C++ Debug UI
+org.eclipse.cdt.debug.ui.category.description=Controls visibility of C/C++ Debug UI contributions
+
+org.eclipse.cdt.debug.ui.activity.toggleInstructionStepMode.name=Instruction Step Mode Button on main Toolbar
+org.eclipse.cdt.debug.ui.activity.toggleInstructionStepMode.description=Control visibility of 'Toggle Instruction Step Mode' button on the main Toolbar
\ No newline at end of file
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 5b6a2fa3287..8e68965a210 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -1302,6 +1302,7 @@
              disabledIcon="icons/dlcl16/instr_step.gif"
              helpContextId="toggle_instruction_step_mode_action_context"
              icon="icons/elcl16/instr_step.gif"
+             id="main.run.menu:org.eclipse.cdt.debug.ui.ToggleInstructionStepModeCommand"
              label="%ToggleInstructionStepModeAction.label"
              style="toggle"
              tooltip="%ToggleInstructionStepModeAction.tooltip">
@@ -1321,6 +1322,7 @@
              disabledIcon="icons/dlcl16/instr_step.gif"
              helpContextId="toggle_instruction_step_mode_action_context"
              icon="icons/elcl16/instr_step.gif"
+             id="main.toolbar:org.eclipse.cdt.debug.ui.ToggleInstructionStepModeCommand"
              label="%ToggleInstructionStepModeAction.label"
              style="toggle"
              tooltip="%ToggleInstructionStepModeAction.tooltip">
@@ -2675,5 +2677,35 @@
            name="%GenericTarget.name">
      </wizard2>
   </extension>
+  
+  <!-- Activity definition that controls the visibility of  Toggle Instruction Step Mode command-->
+  <extension point="org.eclipse.ui.activities">
+   <category
+         id="org.eclipse.cdt.debug.ui.category"
+         name="%org.eclipse.cdt.debug.ui.category.name"
+         description="%org.eclipse.cdt.debug.ui.category.description">
+   </category>
+
+   <activity
+         id="org.eclipse.cdt.debug.ui.activity.toggleInstructionStepMode"
+         name="%org.eclipse.cdt.debug.ui.activity.toggleInstructionStepMode.name"
+         description="%org.eclipse.cdt.debug.ui.activity.toggleInstructionStepMode.description">
+   </activity>
+
+   <activityPatternBinding
+         activityId="org.eclipse.cdt.debug.ui.activity.toggleInstructionStepMode"
+         pattern="org\.eclipse\.cdt\.debug\.ui/main\.toolbar:org\.eclipse\.cdt\.debug\.ui\.ToggleInstructionStepModeCommand">
+   </activityPatternBinding>
+   <activityPatternBinding
+         activityId="org.eclipse.cdt.debug.ui.activity.toggleInstructionStepMode"
+         pattern="org\.eclipse\.cdt\.debug\.ui/main\.run\.menu:org\.eclipse\.cdt\.debug\.ui\.ToggleInstructionStepModeCommand">
+   </activityPatternBinding>
+
+   <categoryActivityBinding
+         activityId="org.eclipse.cdt.debug.ui.activity.toggleInstructionStepMode"
+         categoryId="org.eclipse.cdt.debug.ui.category">
+   </categoryActivityBinding>
+</extension>
+  
     
 </plugin>