Skip to content

Commit

Permalink
Restore the empty activity IDs (eclipse-cdt#1045)
Browse files Browse the repository at this point in the history
In eclipse-cdt#974 I removed activities we were not using anymore, but it turns
out if LaunchUtils.enableActivity is called on a removed id, strange
things happen, such as other activities incorrectly being enabled.
This may be a bug in platform, or just undefined behavior. But because
extenders do have calls to LaunchUtils.enableActivity in their code,
leave the empty activity ids behind.

Fixes eclipse-cdt#1044
  • Loading branch information
jonahgraham authored Jan 17, 2025
1 parent 5667224 commit 1abb990
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 0 deletions.
9 changes: 9 additions & 0 deletions releng/org.eclipse.cdt/plugin.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,12 @@ cheatsheet.helloworld.desc=Create a Hello World Program in C++
cheatsheet.helloworld.name=Hello World

activity.name = Debug Update Modes
activity.description.dsf = Debug Services Framework
activity.name.dsf = CDT-DSF Debug Services Framework

activity.description.dsfgdb = C/C++ debugging with the DSF GDB debugger
activity.name.dsfgdb = CDT DSF-GDB - GDB Debugging
activity.description.cdtdebug = Commands for C/C++ debugging
activity.name.cdtdebug = CDT Debug - C/C++ Development Tools
activity.description.cdigdb = C/C++ debugging with the CDI (legacy) GDB debugger
activity.name.cdigdb = CDT CDI-GDB - GDB Debugging (Legacy)
38 changes: 38 additions & 0 deletions releng/org.eclipse.cdt/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,42 @@
pattern="org\.eclipse\.cdt\.dsf\.ui/org\.eclipse\.cdt\.dsf\.debug\.ui\.[A-Za-z]+\.viewmodel\.update\.actions\.refresh">
</activityPatternBinding>
</extension>

<!-- In #974 I removed activities we were not using anymore, but it turns
out if LaunchUtils.enableActivity is called on a removed id, strange
things happen, such as other activities incorrectly being enabled.
This may be a bug in platform, or just undefined behavior. But because
extenders do have calls to LaunchUtils.enableActivity in their code,
leave the empty activity ids behind. -->

<extension
point="org.eclipse.ui.activities">

<activity
name="%activity.name.dsf"
description="%activity.description.dsf"
id="org.eclipse.cdt.dsf.ui.dsfActivity">
</activity>

<activity
name="%activity.name.dsfgdb"
description="%activity.description.dsfgdb"
id="org.eclipse.cdt.debug.dsfgdbActivity">
</activity>

<activity
name="%activity.name.cdtdebug"
description="%activity.description.cdtdebug"
id="org.eclipse.cdt.debug.ui.cdtActivity">
</activity>

<defaultEnablement id="org.eclipse.cdt.debug.ui.cdtActivity" />

<activity
name="%activity.name.cdigdb"
description="%activity.description.cdigdb"
id="org.eclipse.cdt.debug.cdigdbActivity">
</activity>

</extension>
</plugin>

0 comments on commit 1abb990

Please sign in to comment.