@@ -3,10 +3,7 @@ import { ContainerModule } from '@theia/core/shared/inversify';
33import { WidgetFactory } from '@theia/core/lib/browser/widget-manager' ;
44import { CommandContribution } from '@theia/core/lib/common/command' ;
55import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution' ;
6- import {
7- TabBarToolbarContribution ,
8- TabBarToolbarFactory ,
9- } from '@theia/core/lib/browser/shell/tab-bar-toolbar' ;
6+ import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar' ;
107import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider' ;
118import {
129 FrontendApplicationContribution ,
@@ -84,10 +81,7 @@ import { BoardsAutoInstaller } from './boards/boards-auto-installer';
8481import { ShellLayoutRestorer } from './theia/core/shell-layout-restorer' ;
8582import { ListItemRenderer } from './widgets/component-list/list-item-renderer' ;
8683import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution' ;
87- import {
88- MonacoThemeJson ,
89- MonacoThemingService ,
90- } from '@theia/monaco/lib/browser/monaco-theming-service' ;
84+
9185import {
9286 ArduinoDaemonPath ,
9387 ArduinoDaemon ,
@@ -137,7 +131,6 @@ import { Settings } from './contributions/settings';
137131import { WorkspaceCommandContribution } from './theia/workspace/workspace-commands' ;
138132import { WorkspaceDeleteHandler as TheiaWorkspaceDeleteHandler } from '@theia/workspace/lib/browser/workspace-delete-handler' ;
139133import { WorkspaceDeleteHandler } from './theia/workspace/workspace-delete-handler' ;
140- import { TabBarToolbar } from './theia/core/tab-bar-toolbar' ;
141134import { EditorWidgetFactory as TheiaEditorWidgetFactory } from '@theia/editor/lib/browser/editor-widget-factory' ;
142135import { EditorWidgetFactory } from './theia/editor/editor-widget-factory' ;
143136import { BurnBootloader } from './contributions/burn-bootloader' ;
@@ -181,8 +174,6 @@ import { EditorCommandContribution } from './theia/editor/editor-command';
181174import { NavigatorTabBarDecorator as TheiaNavigatorTabBarDecorator } from '@theia/navigator/lib/browser/navigator-tab-bar-decorator' ;
182175import { NavigatorTabBarDecorator } from './theia/navigator/navigator-tab-bar-decorator' ;
183176import { Debug } from './contributions/debug' ;
184- import { DebugSessionManager } from './theia/debug/debug-session-manager' ;
185- import { DebugSessionManager as TheiaDebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager' ;
186177import { Sketchbook } from './contributions/sketchbook' ;
187178import { DebugFrontendApplicationContribution } from './theia/debug/debug-frontend-application-contribution' ;
188179import { DebugFrontendApplicationContribution as TheiaDebugFrontendApplicationContribution } from '@theia/debug/lib/browser/debug-frontend-application-contribution' ;
@@ -241,7 +232,6 @@ import { UploadFirmware } from './contributions/upload-firmware';
241232import {
242233 UploadFirmwareDialog ,
243234 UploadFirmwareDialogProps ,
244- UploadFirmwareDialogWidget ,
245235} from './dialogs/firmware-uploader/firmware-uploader-dialog' ;
246236
247237import { UploadCertificate } from './contributions/upload-certificate' ;
@@ -258,7 +248,6 @@ import { PlotterFrontendContribution } from './serial/plotter/plotter-frontend-c
258248import {
259249 UserFieldsDialog ,
260250 UserFieldsDialogProps ,
261- UserFieldsDialogWidget ,
262251} from './dialogs/user-fields/user-fields-dialog' ;
263252import { nls } from '@theia/core/lib/common' ;
264253import { IDEUpdaterCommands } from './ide-updater/ide-updater-commands' ;
@@ -271,7 +260,6 @@ import { IDEUpdaterClientImpl } from './ide-updater/ide-updater-client-impl';
271260import {
272261 IDEUpdaterDialog ,
273262 IDEUpdaterDialogProps ,
274- IDEUpdaterDialogWidget ,
275263} from './dialogs/ide-updater/ide-updater-dialog' ;
276264import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-provider' ;
277265import { MonitorModel } from './monitor-model' ;
@@ -313,10 +301,6 @@ import { SelectedBoard } from './contributions/selected-board';
313301import { CheckForIDEUpdates } from './contributions/check-for-ide-updates' ;
314302import { OpenBoardsConfig } from './contributions/open-boards-config' ;
315303import { SketchFilesTracker } from './contributions/sketch-files-tracker' ;
316- import { MonacoThemeServiceIsReady } from './utils/window' ;
317- import { Deferred } from '@theia/core/lib/common/promise-util' ;
318- import { StatusBarImpl } from './theia/core/status-bar' ;
319- import { StatusBarImpl as TheiaStatusBarImpl } from '@theia/core/lib/browser' ;
320304import { EditorMenuContribution } from './theia/editor/editor-file' ;
321305import { EditorMenuContribution as TheiaEditorMenuContribution } from '@theia/editor/lib/browser/editor-menu' ;
322306import { PreferencesEditorWidget as TheiaPreferencesEditorWidget } from '@theia/preferences/lib/browser/views/preference-editor-widget' ;
@@ -337,32 +321,16 @@ import { InterfaceScale } from './contributions/interface-scale';
337321import { OpenHandler } from '@theia/core/lib/browser/opener-service' ;
338322import { NewCloudSketch } from './contributions/new-cloud-sketch' ;
339323import { SketchbookCompositeWidget } from './widgets/sketchbook/sketchbook-composite-widget' ;
340-
341- const registerArduinoThemes = ( ) => {
342- const themes : MonacoThemeJson [ ] = [
343- {
344- id : 'arduino-theme' ,
345- label : 'Light (Arduino)' ,
346- uiTheme : 'vs' ,
347- json : require ( '../../src/browser/data/default.color-theme.json' ) ,
348- } ,
349- {
350- id : 'arduino-theme-dark' ,
351- label : 'Dark (Arduino)' ,
352- uiTheme : 'vs-dark' ,
353- json : require ( '../../src/browser/data/dark.color-theme.json' ) ,
354- } ,
355- ] ;
356- themes . forEach ( ( theme ) => MonacoThemingService . register ( theme ) ) ;
357- } ;
358- // eslint-disable-next-line @typescript-eslint/no-explicit-any
359- const global = window as any ;
360- const ready = global [ MonacoThemeServiceIsReady ] as Deferred ;
361- if ( ready ) {
362- ready . promise . then ( registerArduinoThemes ) ;
363- } else {
364- registerArduinoThemes ( ) ;
365- }
324+ import { WindowTitleUpdater } from './theia/core/window-title-updater' ;
325+ import { WindowTitleUpdater as TheiaWindowTitleUpdater } from '@theia/core/lib/browser/window/window-title-updater' ;
326+ import { ThemeService } from './theia/core/theming' ;
327+ import { ThemeService as TheiaThemeService } from '@theia/core/lib/browser/theming' ;
328+ import { MonacoThemingService } from './theia/monaco/monaco-theming-service' ;
329+ import { MonacoThemingService as TheiaMonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service' ;
330+ import { TypeHierarchyServiceProvider } from './theia/typehierarchy/type-hierarchy-service' ;
331+ import { TypeHierarchyServiceProvider as TheiaTypeHierarchyServiceProvider } from '@theia/typehierarchy/lib/browser/typehierarchy-service' ;
332+ import { TypeHierarchyContribution } from './theia/typehierarchy/type-hierarchy-contribution' ;
333+ import { TypeHierarchyContribution as TheiaTypeHierarchyContribution } from '@theia/typehierarchy/lib/browser/typehierarchy-contribution' ;
366334
367335export default new ContainerModule ( ( bind , unbind , isBound , rebind ) => {
368336 // Commands and toolbar items
@@ -587,14 +555,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
587555 . to ( WorkspaceDeleteHandler )
588556 . inSingletonScope ( ) ;
589557 rebind ( TheiaEditorWidgetFactory ) . to ( EditorWidgetFactory ) . inSingletonScope ( ) ;
590- rebind ( TabBarToolbarFactory ) . toFactory (
591- ( { container : parentContainer } ) =>
592- ( ) => {
593- const container = parentContainer . createChild ( ) ;
594- container . bind ( TabBarToolbar ) . toSelf ( ) . inSingletonScope ( ) ;
595- return container . get ( TabBarToolbar ) ;
596- }
597- ) ;
598558 bind ( OutputChannelManager ) . toSelf ( ) . inSingletonScope ( ) ;
599559 rebind ( TheiaOutputChannelManager ) . toService ( OutputChannelManager ) ;
600560 bind ( OutputChannelRegistryMainImpl ) . toSelf ( ) . inTransientScope ( ) ;
@@ -838,9 +798,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
838798 bind ( AboutDialog ) . toSelf ( ) . inSingletonScope ( ) ;
839799 rebind ( TheiaAboutDialog ) . toService ( AboutDialog ) ;
840800
841- // To avoid running `Save All` when there are no dirty editors before starting the debug session.
842- bind ( DebugSessionManager ) . toSelf ( ) . inSingletonScope ( ) ;
843- rebind ( TheiaDebugSessionManager ) . toService ( DebugSessionManager ) ;
844801 // To remove the `Run` menu item from the application menu.
845802 bind ( DebugFrontendApplicationContribution ) . toSelf ( ) . inSingletonScope ( ) ;
846803 rebind ( TheiaDebugFrontendApplicationContribution ) . toService (
@@ -854,10 +811,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
854811 bind ( WidgetManager ) . toSelf ( ) . inSingletonScope ( ) ;
855812 rebind ( TheiaWidgetManager ) . toService ( WidgetManager ) ;
856813
857- // To avoid running a status bar update on every single `keypress` event from the editor.
858- bind ( StatusBarImpl ) . toSelf ( ) . inSingletonScope ( ) ;
859- rebind ( TheiaStatusBarImpl ) . toService ( StatusBarImpl ) ;
860-
861814 // Debounced update for the tab-bar toolbar when typing in the editor.
862815 bind ( DockPanelRenderer ) . toSelf ( ) ;
863816 rebind ( TheiaDockPanelRenderer ) . toService ( DockPanelRenderer ) ;
@@ -942,12 +895,11 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
942895 bind ( LocalCacheFsProvider ) . toSelf ( ) . inSingletonScope ( ) ;
943896 bind ( FileServiceContribution ) . toService ( LocalCacheFsProvider ) ;
944897 bind ( CloudSketchbookCompositeWidget ) . toSelf ( ) ;
945- bind < WidgetFactory > ( WidgetFactory ) . toDynamicValue ( ( ctx ) => ( {
898+ bind ( WidgetFactory ) . toDynamicValue ( ( ctx ) => ( {
946899 id : 'cloud-sketchbook-composite-widget' ,
947900 createWidget : ( ) => ctx . container . get ( CloudSketchbookCompositeWidget ) ,
948901 } ) ) ;
949902
950- bind ( UploadFirmwareDialogWidget ) . toSelf ( ) . inSingletonScope ( ) ;
951903 bind ( UploadFirmwareDialog ) . toSelf ( ) . inSingletonScope ( ) ;
952904 bind ( UploadFirmwareDialogProps ) . toConstantValue ( {
953905 title : 'UploadFirmware' ,
@@ -958,13 +910,11 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
958910 title : 'UploadCertificate' ,
959911 } ) ;
960912
961- bind ( IDEUpdaterDialogWidget ) . toSelf ( ) . inSingletonScope ( ) ;
962913 bind ( IDEUpdaterDialog ) . toSelf ( ) . inSingletonScope ( ) ;
963914 bind ( IDEUpdaterDialogProps ) . toConstantValue ( {
964915 title : 'IDEUpdater' ,
965916 } ) ;
966917
967- bind ( UserFieldsDialogWidget ) . toSelf ( ) . inSingletonScope ( ) ;
968918 bind ( UserFieldsDialog ) . toSelf ( ) . inSingletonScope ( ) ;
969919 bind ( UserFieldsDialogProps ) . toConstantValue ( {
970920 title : 'UserFields' ,
@@ -991,4 +941,23 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
991941 rebind ( TheiaHostedPluginSupport ) . toService ( HostedPluginSupport ) ;
992942 bind ( HostedPluginEvents ) . toSelf ( ) . inSingletonScope ( ) ;
993943 bind ( FrontendApplicationContribution ) . toService ( HostedPluginEvents ) ;
944+
945+ // custom window titles
946+ bind ( WindowTitleUpdater ) . toSelf ( ) . inSingletonScope ( ) ;
947+ rebind ( TheiaWindowTitleUpdater ) . toService ( WindowTitleUpdater ) ;
948+
949+ // register Arduino themes
950+ bind ( ThemeService ) . toSelf ( ) . inSingletonScope ( ) ;
951+ rebind ( TheiaThemeService ) . toService ( ThemeService ) ;
952+ bind ( MonacoThemingService ) . toSelf ( ) . inSingletonScope ( ) ;
953+ rebind ( TheiaMonacoThemingService ) . toService ( MonacoThemingService ) ;
954+
955+ // disable type-hierarchy support
956+ // https://github.com/eclipse-theia/theia/commit/16c88a584bac37f5cf3cc5eb92ffdaa541bda5be
957+ bind ( TypeHierarchyServiceProvider ) . toSelf ( ) . inSingletonScope ( ) ;
958+ rebind ( TheiaTypeHierarchyServiceProvider ) . toService (
959+ TypeHierarchyServiceProvider
960+ ) ;
961+ bind ( TypeHierarchyContribution ) . toSelf ( ) . inSingletonScope ( ) ;
962+ rebind ( TheiaTypeHierarchyContribution ) . toService ( TypeHierarchyContribution ) ;
994963} ) ;
0 commit comments