forked from arduino/arduino-ide
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- revert debug feature patching (eclipse-theia/theia#11984) - revert menu ordering hack (eclipse-theia/theia#8377) Signed-off-by: Akos Kitta <[email protected]>
- Loading branch information
Akos Kitta
committed
Mar 22, 2023
1 parent
9b49712
commit 2fe2674
Showing
17 changed files
with
688 additions
and
1,161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import '../../src/browser/style/index.css'; | ||
| import { Container, ContainerModule } from '@theia/core/shared/inversify'; | ||
| import { ContainerModule } from '@theia/core/shared/inversify'; | ||
| import { WidgetFactory } from '@theia/core/lib/browser/widget-manager'; | ||
| import { CommandContribution } from '@theia/core/lib/common/command'; | ||
| import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution'; | ||
|
|
@@ -338,16 +338,6 @@ import { TypeHierarchyContribution } from './theia/typehierarchy/type-hierarchy- | |
| import { TypeHierarchyContribution as TheiaTypeHierarchyContribution } from '@theia/typehierarchy/lib/browser/typehierarchy-contribution'; | ||
| import { DefaultDebugSessionFactory } from './theia/debug/debug-session-contribution'; | ||
| import { DebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution'; | ||
| import { DebugToolbar } from './theia/debug/debug-toolbar-widget'; | ||
| import { DebugToolBar as TheiaDebugToolbar } from '@theia/debug/lib/browser/view/debug-toolbar-widget'; | ||
| import { PluginMenuCommandAdapter } from './theia/plugin-ext/plugin-menu-command-adapter'; | ||
| import { PluginMenuCommandAdapter as TheiaPluginMenuCommandAdapter } from '@theia/plugin-ext/lib/main/browser/menus/plugin-menu-command-adapter'; | ||
| import { DebugSessionManager } from './theia/debug/debug-session-manager'; | ||
| import { DebugSessionManager as TheiaDebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager'; | ||
| import { DebugWidget } from '@theia/debug/lib/browser/view/debug-widget'; | ||
| import { DebugViewModel } from '@theia/debug/lib/browser/view/debug-view-model'; | ||
| import { DebugSessionWidget } from '@theia/debug/lib/browser/view/debug-session-widget'; | ||
| import { DebugConfigurationWidget } from '@theia/debug/lib/browser/view/debug-configuration-widget'; | ||
| import { ConfigServiceClient } from './config/config-service-client'; | ||
| import { ValidateSketch } from './contributions/validate-sketch'; | ||
| import { RenameCloudSketch } from './contributions/rename-cloud-sketch'; | ||
|
|
@@ -993,37 +983,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => { | |
| bind(TypeHierarchyContribution).toSelf().inSingletonScope(); | ||
| rebind(TheiaTypeHierarchyContribution).toService(TypeHierarchyContribution); | ||
|
|
||
| // patched the debugger for `[email protected]` | ||
| // https://github.com/eclipse-theia/theia/issues/11871 | ||
| // https://github.com/eclipse-theia/theia/issues/11879 | ||
| // https://github.com/eclipse-theia/theia/issues/11880 | ||
| // https://github.com/eclipse-theia/theia/issues/11885 | ||
| // https://github.com/eclipse-theia/theia/issues/11886 | ||
| // https://github.com/eclipse-theia/theia/issues/11916 | ||
| // based on: https://github.com/eclipse-theia/theia/compare/master...kittaakos:theia:%2311871 | ||
| bind(DefaultDebugSessionFactory).toSelf().inSingletonScope(); | ||
| rebind(DebugSessionFactory).toService(DefaultDebugSessionFactory); | ||
| bind(DebugSessionManager).toSelf().inSingletonScope(); | ||
| rebind(TheiaDebugSessionManager).toService(DebugSessionManager); | ||
| bind(DebugToolbar).toSelf().inSingletonScope(); | ||
| rebind(TheiaDebugToolbar).toService(DebugToolbar); | ||
| bind(PluginMenuCommandAdapter).toSelf().inSingletonScope(); | ||
| rebind(TheiaPluginMenuCommandAdapter).toService(PluginMenuCommandAdapter); | ||
| bind(WidgetFactory) | ||
| .toDynamicValue(({ container }) => ({ | ||
| id: DebugWidget.ID, | ||
| createWidget: () => { | ||
| const child = new Container({ defaultScope: 'Singleton' }); | ||
| child.parent = container; | ||
| child.bind(DebugViewModel).toSelf(); | ||
| child.bind(DebugToolbar).toSelf(); // patched toolbar | ||
| child.bind(DebugSessionWidget).toSelf(); | ||
| child.bind(DebugConfigurationWidget).toSelf(); | ||
| child.bind(DebugWidget).toSelf(); | ||
| return child.get(DebugWidget); | ||
| }, | ||
| })) | ||
| .inSingletonScope(); | ||
|
|
||
| bind(SidebarBottomMenuWidget).toSelf(); | ||
| rebind(TheiaSidebarBottomMenuWidget).toService(SidebarBottomMenuWidget); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 0 additions & 29 deletions
29
arduino-ide-extension/src/browser/theia/debug/debug-action.tsx
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 0 additions & 120 deletions
120
arduino-ide-extension/src/browser/theia/debug/debug-session-manager.ts
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.