diff --git a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx index 00df7799..b99db5ea 100644 --- a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx +++ b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx @@ -24,7 +24,7 @@ import { BoardsToolBarItem } from './boards/boards-toolbar-item'; import { BoardsConfig } from './boards/boards-config'; import { MonitorConnection } from './monitor/monitor-connection'; import { MonitorViewContribution } from './monitor/monitor-view-contribution'; -import { ArduinoWorkspaceService } from './customization/workspace/arduino-workspace-service'; +import { WorkspaceService } from './customization/workspace/workspace-service'; import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution'; import { OutputContribution } from '@theia/output/lib/browser/output-contribution'; import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution'; @@ -94,8 +94,8 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut @inject(StatusBar) protected readonly statusBar: StatusBar; - @inject(ArduinoWorkspaceService) - protected readonly workspaceService: ArduinoWorkspaceService; + @inject(WorkspaceService) + protected readonly workspaceService: WorkspaceService; @inject(MonitorConnection) protected readonly monitorConnection: MonitorConnection; diff --git a/arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts b/arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts index f667806b..5800eb04 100644 --- a/arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts +++ b/arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts @@ -22,19 +22,19 @@ import { ToolOutputServiceClient } from '../common/protocol/tool-output-service' import { ToolOutputService } from '../common/protocol/tool-output-service'; import { ToolOutputServiceClientImpl } from './tool-output/client-service-impl'; import { BoardsServiceClientImpl } from './boards/boards-service-client-impl'; -import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service'; -import { ArduinoWorkspaceService } from './customization/workspace/arduino-workspace-service'; +import { WorkspaceService as TheiaWorkspaceService } from '@theia/workspace/lib/browser/workspace-service'; +import { WorkspaceService } from './customization/workspace/workspace-service'; import { OutlineViewContribution as TheiaOutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution'; -import { ArduinoOutlineViewContribution } from './customization/outline/arduino-outline-contribution'; +import { OutlineViewContribution } from './customization/outline/outline-contribution'; import { ProblemContribution as TheiaProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution'; -import { ArduinoProblemContribution } from './customization/markers/arduino-problem-contribution'; -import { ArduinoNavigatorContribution } from './customization/navigator/arduino-navigator-contribution'; +import { ProblemContribution } from './customization/markers/problem-contribution'; +import { FileNavigatorContribution } from './customization/navigator/navigator-contribution'; import { FileNavigatorContribution as TheiaFileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution'; import { ArduinoToolbarContribution } from './toolbar/arduino-toolbar-contribution'; import { EditorContribution as TheiaEditorContribution } from '@theia/editor/lib/browser/editor-contribution'; -import { ArduinoEditorContribution } from './customization/editor/arduino-editor-contribution'; +import { EditorContribution } from './customization/editor/arduino-editor-contribution'; import { MonacoStatusBarContribution as TheiaMonacoStatusBarContribution } from '@theia/monaco/lib/browser/monaco-status-bar-contribution'; -import { ArduinoMonacoStatusBarContribution } from './customization/monaco/arduino-monaco-status-bar-contribution'; +import { MonacoStatusBarContribution } from './customization/monaco/monaco-status-bar-contribution'; import { ApplicationShell as TheiaApplicationShell, ShellLayoutRestorer as TheiaShellLayoutRestorer, KeybindingContribution } from '@theia/core/lib/browser'; import { MenuContribution } from '@theia/core/lib/common/menu'; import { ApplicationShell } from './customization/core/application-shell'; @@ -42,9 +42,9 @@ import { FrontendApplication } from './customization/core/frontend-application'; import { BoardsConfigDialog, BoardsConfigDialogProps } from './boards/boards-config-dialog'; import { BoardsConfigDialogWidget } from './boards/boards-config-dialog-widget'; import { ScmContribution as TheiaScmContribution } from '@theia/scm/lib/browser/scm-contribution'; -import { ArduinoScmContribution } from './customization/scm/arduino-scm-contribution'; +import { ScmContribution } from './customization/scm/scm-contribution'; import { SearchInWorkspaceFrontendContribution as TheiaSearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution'; -import { ArduinoSearchInWorkspaceContribution } from './customization/search-in-workspace/arduino-search-in-workspace-contribution'; +import { SearchInWorkspaceFrontendContribution } from './customization/search-in-workspace/search-in-workspace-frontend-contribution'; import { LibraryListWidgetFrontendContribution } from './library/library-widget-frontend-contribution'; import { MonitorServiceClientImpl } from './monitor/monitor-service-client-impl'; import { MonitorServicePath, MonitorService, MonitorServiceClient } from '../common/protocol/monitor-service'; @@ -55,20 +55,20 @@ import { MonitorConnection } from './monitor/monitor-connection'; import { MonitorModel } from './monitor/monitor-model'; import { TabBarDecoratorService as TheiaTabBarDecoratorService } from '@theia/core/lib/browser/shell/tab-bar-decorator'; import { TabBarDecoratorService } from './customization/core/tab-bar-decorator'; -import { ProblemManager } from '@theia/markers/lib/browser'; -import { ArduinoProblemManager } from './customization/markers/arduino-problem-manager'; +import { ProblemManager as TheiaProblemManager } from '@theia/markers/lib/browser'; +import { ProblemManager } from './customization/markers/problem-manager'; import { BoardsAutoInstaller } from './boards/boards-auto-installer'; import { AboutDialog as TheiaAboutDialog } from '@theia/core/lib/browser/about-dialog'; import { AboutDialog } from './customization/core/about-dialog'; import { ShellLayoutRestorer } from './customization/core/shell-layout-restorer'; import { EditorMode } from './editor-mode'; -import { ListItemRenderer } from './components/component-list/list-item-renderer'; +import { ListItemRenderer } from './widgets/component-list/list-item-renderer'; import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution'; import { MonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service'; import { ArduinoDaemonClientImpl } from './arduino-daemon-client-impl'; import { ArduinoDaemonClient, ArduinoDaemonPath, ArduinoDaemon } from '../common/protocol/arduino-daemon'; -import { EditorManager } from '@theia/editor/lib/browser'; -import { ArduinoEditorManager } from './customization/editor/arduino-editor-manager'; +import { EditorManager as TheiaEditorManager } from '@theia/editor/lib/browser'; +import { EditorManager } from './customization/editor/editor-manager'; import { FrontendConnectionStatusService, ApplicationConnectionStatusContribution } from './customization/core/connection-status-service'; import { FrontendConnectionStatusService as TheiaFrontendConnectionStatusService, @@ -81,7 +81,7 @@ import { BoardsConfigStore } from './boards/boards-config-store'; import { ILogger } from '@theia/core'; import { FileSystemExt, FileSystemExtPath } from '../common/protocol/filesystem-ext'; import { WorkspaceFrontendContribution as TheiaWorkspaceFrontendContribution, FileMenuContribution as TheiaFileMenuContribution } from '@theia/workspace/lib/browser'; -import { ArduinoWorkspaceFrontendContribution, ArduinoFileMenuContribution } from './customization/workspace/arduino-workspace-frontend-contribution'; +import { WorkspaceFrontendContribution, ArduinoFileMenuContribution } from './customization/workspace/workspace-frontend-contribution'; import { Contribution } from './contributions/contribution'; import { NewSketch } from './contributions/new-sketch'; import { OpenSketch } from './contributions/open-sketch'; @@ -248,24 +248,24 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un return client; }).inSingletonScope(); - bind(ArduinoWorkspaceService).toSelf().inSingletonScope(); - rebind(WorkspaceService).toService(ArduinoWorkspaceService); + bind(WorkspaceService).toSelf().inSingletonScope(); + rebind(TheiaWorkspaceService).toService(WorkspaceService); // Customizing default Theia layout based on the editor mode: `pro-mode` or `classic`. bind(EditorMode).toSelf().inSingletonScope(); bind(FrontendApplicationContribution).toService(EditorMode); // Layout and shell customizations. - rebind(TheiaOutlineViewContribution).to(ArduinoOutlineViewContribution).inSingletonScope(); - rebind(TheiaProblemContribution).to(ArduinoProblemContribution).inSingletonScope(); - rebind(TheiaFileNavigatorContribution).to(ArduinoNavigatorContribution).inSingletonScope(); - rebind(TheiaEditorContribution).to(ArduinoEditorContribution).inSingletonScope(); - rebind(TheiaMonacoStatusBarContribution).to(ArduinoMonacoStatusBarContribution).inSingletonScope(); + rebind(TheiaOutlineViewContribution).to(OutlineViewContribution).inSingletonScope(); + rebind(TheiaProblemContribution).to(ProblemContribution).inSingletonScope(); + rebind(TheiaFileNavigatorContribution).to(FileNavigatorContribution).inSingletonScope(); + rebind(TheiaEditorContribution).to(EditorContribution).inSingletonScope(); + rebind(TheiaMonacoStatusBarContribution).to(MonacoStatusBarContribution).inSingletonScope(); rebind(TheiaApplicationShell).to(ApplicationShell).inSingletonScope(); - rebind(TheiaScmContribution).to(ArduinoScmContribution).inSingletonScope(); - rebind(TheiaSearchInWorkspaceFrontendContribution).to(ArduinoSearchInWorkspaceContribution).inSingletonScope(); + rebind(TheiaScmContribution).to(ScmContribution).inSingletonScope(); + rebind(TheiaSearchInWorkspaceFrontendContribution).to(SearchInWorkspaceFrontendContribution).inSingletonScope(); rebind(TheiaFrontendApplication).to(FrontendApplication).inSingletonScope(); - rebind(TheiaWorkspaceFrontendContribution).to(ArduinoWorkspaceFrontendContribution).inSingletonScope(); + rebind(TheiaWorkspaceFrontendContribution).to(WorkspaceFrontendContribution).inSingletonScope(); rebind(TheiaFileMenuContribution).to(ArduinoFileMenuContribution).inSingletonScope(); // Show a disconnected status bar, when the daemon is not available @@ -275,16 +275,16 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un rebind(TheiaFrontendConnectionStatusService).toService(FrontendConnectionStatusService); // Editor customizations. Sets the editor to `readOnly` if under the data dir. - bind(ArduinoEditorManager).toSelf().inSingletonScope(); - rebind(EditorManager).toService(ArduinoEditorManager); + bind(EditorManager).toSelf().inSingletonScope(); + rebind(TheiaEditorManager).toService(EditorManager); // Decorator customizations bind(TabBarDecoratorService).toSelf().inSingletonScope(); rebind(TheiaTabBarDecoratorService).toService(TabBarDecoratorService); // Problem markers - bind(ArduinoProblemManager).toSelf().inSingletonScope(); - rebind(ProblemManager).toService(ArduinoProblemManager); + bind(ProblemManager).toSelf().inSingletonScope(); + rebind(TheiaProblemManager).toService(ProblemManager); // About dialog to show the CLI version bind(AboutDialog).toSelf().inSingletonScope(); diff --git a/arduino-ide-extension/src/browser/boards/boards-auto-installer.ts b/arduino-ide-extension/src/browser/boards/boards-auto-installer.ts index 3fd8b2ce..50a06166 100644 --- a/arduino-ide-extension/src/browser/boards/boards-auto-installer.ts +++ b/arduino-ide-extension/src/browser/boards/boards-auto-installer.ts @@ -4,7 +4,7 @@ import { FrontendApplicationContribution } from '@theia/core/lib/browser/fronten import { BoardsService, Board } from '../../common/protocol/boards-service'; import { BoardsServiceClientImpl } from './boards-service-client-impl'; import { BoardsListWidgetFrontendContribution } from './boards-widget-frontend-contribution'; -import { InstallationProgressDialog } from '../components/progress-dialog'; +import { InstallationProgressDialog } from '../widgets/progress-dialog'; import { BoardsConfig } from './boards-config'; /** diff --git a/arduino-ide-extension/src/browser/boards/boards-list-widget.ts b/arduino-ide-extension/src/browser/boards/boards-list-widget.ts index 54947d62..c48e76c5 100644 --- a/arduino-ide-extension/src/browser/boards/boards-list-widget.ts +++ b/arduino-ide-extension/src/browser/boards/boards-list-widget.ts @@ -1,7 +1,7 @@ import { inject, injectable } from 'inversify'; import { BoardsPackage, BoardsService } from '../../common/protocol/boards-service'; -import { ListWidget } from '../components/component-list/list-widget'; -import { ListItemRenderer } from '../components/component-list/list-item-renderer'; +import { ListWidget } from '../widgets/component-list/list-widget'; +import { ListItemRenderer } from '../widgets/component-list/list-item-renderer'; @injectable() export class BoardsListWidget extends ListWidget { diff --git a/arduino-ide-extension/src/browser/boards/boards-widget-frontend-contribution.ts b/arduino-ide-extension/src/browser/boards/boards-widget-frontend-contribution.ts index 623f5cd2..ea27ef85 100644 --- a/arduino-ide-extension/src/browser/boards/boards-widget-frontend-contribution.ts +++ b/arduino-ide-extension/src/browser/boards/boards-widget-frontend-contribution.ts @@ -2,7 +2,7 @@ import { injectable } from 'inversify'; import { MenuModelRegistry } from '@theia/core'; import { BoardsListWidget } from './boards-list-widget'; import { BoardsPackage } from '../../common/protocol/boards-service'; -import { ListWidgetFrontendContribution } from '../components/component-list/list-widget-frontend-contribution'; +import { ListWidgetFrontendContribution } from '../widgets/component-list/list-widget-frontend-contribution'; import { ArduinoMenus } from '../menu/arduino-menus'; @injectable() diff --git a/arduino-ide-extension/src/browser/customization/editor/arduino-editor-contribution.ts b/arduino-ide-extension/src/browser/customization/editor/arduino-editor-contribution.ts index 25f64e6a..e92c4c25 100644 --- a/arduino-ide-extension/src/browser/customization/editor/arduino-editor-contribution.ts +++ b/arduino-ide-extension/src/browser/customization/editor/arduino-editor-contribution.ts @@ -1,8 +1,10 @@ -import { EditorContribution } from '@theia/editor/lib/browser/editor-contribution'; +import { injectable } from 'inversify'; +import { EditorContribution as TheiaEditorContribution } from '@theia/editor/lib/browser/editor-contribution'; import { TextEditor } from '@theia/editor/lib/browser'; import { StatusBarAlignment } from '@theia/core/lib/browser'; -export class ArduinoEditorContribution extends EditorContribution { +@injectable() +export class EditorContribution extends TheiaEditorContribution { protected updateLanguageStatus(editor: TextEditor | undefined): void { } diff --git a/arduino-ide-extension/src/browser/customization/editor/arduino-editor-manager.ts b/arduino-ide-extension/src/browser/customization/editor/editor-manager.ts similarity index 88% rename from arduino-ide-extension/src/browser/customization/editor/arduino-editor-manager.ts rename to arduino-ide-extension/src/browser/customization/editor/editor-manager.ts index 11b52496..1681943f 100644 --- a/arduino-ide-extension/src/browser/customization/editor/arduino-editor-manager.ts +++ b/arduino-ide-extension/src/browser/customization/editor/editor-manager.ts @@ -1,12 +1,12 @@ import { inject, injectable } from 'inversify'; import URI from '@theia/core/lib/common/uri'; -import { EditorManager, EditorOpenerOptions } from '@theia/editor/lib/browser/editor-manager'; +import { EditorManager as TheiaEditorManager, EditorOpenerOptions } from '@theia/editor/lib/browser/editor-manager'; import { ConfigService } from '../../../common/protocol/config-service'; import { EditorWidget } from '@theia/editor/lib/browser'; import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor'; @injectable() -export class ArduinoEditorManager extends EditorManager { +export class EditorManager extends TheiaEditorManager { @inject(ConfigService) protected readonly configService: ConfigService; diff --git a/arduino-ide-extension/src/browser/customization/markers/arduino-problem-contribution.ts b/arduino-ide-extension/src/browser/customization/markers/problem-contribution.ts similarity index 84% rename from arduino-ide-extension/src/browser/customization/markers/arduino-problem-contribution.ts rename to arduino-ide-extension/src/browser/customization/markers/problem-contribution.ts index 6edb7765..94186640 100644 --- a/arduino-ide-extension/src/browser/customization/markers/arduino-problem-contribution.ts +++ b/arduino-ide-extension/src/browser/customization/markers/problem-contribution.ts @@ -2,11 +2,11 @@ import { inject, injectable } from 'inversify'; import { KeybindingRegistry } from '@theia/core/lib/browser'; import { ProblemStat } from '@theia/markers/lib/browser/problem/problem-manager'; import { FrontendApplication } from '@theia/core/lib/browser/frontend-application'; -import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution'; +import { ProblemContribution as TheiaProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution'; import { EditorMode } from '../../editor-mode'; @injectable() -export class ArduinoProblemContribution extends ProblemContribution { +export class ProblemContribution extends TheiaProblemContribution { @inject(EditorMode) protected readonly editorMode: EditorMode; diff --git a/arduino-ide-extension/src/browser/customization/markers/arduino-problem-manager.ts b/arduino-ide-extension/src/browser/customization/markers/problem-manager.ts similarity index 86% rename from arduino-ide-extension/src/browser/customization/markers/arduino-problem-manager.ts rename to arduino-ide-extension/src/browser/customization/markers/problem-manager.ts index 8e411e92..105c6d1a 100644 --- a/arduino-ide-extension/src/browser/customization/markers/arduino-problem-manager.ts +++ b/arduino-ide-extension/src/browser/customization/markers/problem-manager.ts @@ -3,11 +3,11 @@ import { Diagnostic } from 'vscode-languageserver-types'; import URI from '@theia/core/lib/common/uri'; import { ILogger } from '@theia/core'; import { Marker } from '@theia/markers/lib/common/marker'; -import { ProblemManager } from '@theia/markers/lib/browser/problem/problem-manager'; +import { ProblemManager as TheiaProblemManager } from '@theia/markers/lib/browser/problem/problem-manager'; import { ConfigService } from '../../../common/protocol/config-service'; @injectable() -export class ArduinoProblemManager extends ProblemManager { +export class ProblemManager extends TheiaProblemManager { @inject(ConfigService) protected readonly configService: ConfigService; diff --git a/arduino-ide-extension/src/browser/customization/monaco/arduino-monaco-status-bar-contribution.ts b/arduino-ide-extension/src/browser/customization/monaco/arduino-monaco-status-bar-contribution.ts deleted file mode 100644 index 39466c71..00000000 --- a/arduino-ide-extension/src/browser/customization/monaco/arduino-monaco-status-bar-contribution.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { MonacoStatusBarContribution } from '@theia/monaco/lib/browser/monaco-status-bar-contribution'; - -export class ArduinoMonacoStatusBarContribution extends MonacoStatusBarContribution { - - protected setConfigTabSizeWidget() { - } - - protected setLineEndingWidget() { - } - -} diff --git a/arduino-ide-extension/src/browser/customization/monaco/monaco-status-bar-contribution.ts b/arduino-ide-extension/src/browser/customization/monaco/monaco-status-bar-contribution.ts new file mode 100644 index 00000000..f673ed45 --- /dev/null +++ b/arduino-ide-extension/src/browser/customization/monaco/monaco-status-bar-contribution.ts @@ -0,0 +1,13 @@ +import { injectable } from 'inversify'; +import { MonacoStatusBarContribution as TheiaMonacoStatusBarContribution } from '@theia/monaco/lib/browser/monaco-status-bar-contribution'; + +@injectable() +export class MonacoStatusBarContribution extends TheiaMonacoStatusBarContribution { + + protected setConfigTabSizeWidget() { + } + + protected setLineEndingWidget() { + } + +} diff --git a/arduino-ide-extension/src/browser/customization/navigator/arduino-navigator-contribution.ts b/arduino-ide-extension/src/browser/customization/navigator/navigator-contribution.ts similarity index 67% rename from arduino-ide-extension/src/browser/customization/navigator/arduino-navigator-contribution.ts rename to arduino-ide-extension/src/browser/customization/navigator/navigator-contribution.ts index 4d9f5dae..1f1b18fa 100644 --- a/arduino-ide-extension/src/browser/customization/navigator/arduino-navigator-contribution.ts +++ b/arduino-ide-extension/src/browser/customization/navigator/navigator-contribution.ts @@ -1,10 +1,10 @@ import { injectable, inject } from 'inversify'; import { FrontendApplication } from '@theia/core/lib/browser/frontend-application'; -import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution'; +import { FileNavigatorContribution as TheiaFileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution'; import { EditorMode } from '../../editor-mode'; @injectable() -export class ArduinoNavigatorContribution extends FileNavigatorContribution { +export class FileNavigatorContribution extends TheiaFileNavigatorContribution { @inject(EditorMode) protected readonly editorMode: EditorMode; diff --git a/arduino-ide-extension/src/browser/customization/outline/arduino-outline-contribution.ts b/arduino-ide-extension/src/browser/customization/outline/outline-contribution.ts similarity index 68% rename from arduino-ide-extension/src/browser/customization/outline/arduino-outline-contribution.ts rename to arduino-ide-extension/src/browser/customization/outline/outline-contribution.ts index a58e3d1e..2bc7fd3a 100644 --- a/arduino-ide-extension/src/browser/customization/outline/arduino-outline-contribution.ts +++ b/arduino-ide-extension/src/browser/customization/outline/outline-contribution.ts @@ -1,10 +1,10 @@ import { injectable, inject } from 'inversify'; import { FrontendApplication } from '@theia/core/lib/browser/frontend-application'; -import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution'; +import { OutlineViewContribution as TheiaOutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution'; import { EditorMode } from '../../editor-mode'; @injectable() -export class ArduinoOutlineViewContribution extends OutlineViewContribution { +export class OutlineViewContribution extends TheiaOutlineViewContribution { @inject(EditorMode) protected readonly editorMode: EditorMode; diff --git a/arduino-ide-extension/src/browser/customization/scm/arduino-scm-contribution.ts b/arduino-ide-extension/src/browser/customization/scm/scm-contribution.ts similarity index 78% rename from arduino-ide-extension/src/browser/customization/scm/arduino-scm-contribution.ts rename to arduino-ide-extension/src/browser/customization/scm/scm-contribution.ts index 122be843..30758d16 100644 --- a/arduino-ide-extension/src/browser/customization/scm/arduino-scm-contribution.ts +++ b/arduino-ide-extension/src/browser/customization/scm/scm-contribution.ts @@ -1,10 +1,10 @@ import { inject, injectable } from 'inversify'; -import { ScmContribution } from '@theia/scm/lib/browser/scm-contribution'; +import { ScmContribution as TheiaScmContribution } from '@theia/scm/lib/browser/scm-contribution'; import { StatusBarEntry } from '@theia/core/lib/browser/status-bar/status-bar'; import { EditorMode } from '../../editor-mode'; @injectable() -export class ArduinoScmContribution extends ScmContribution { +export class ScmContribution extends TheiaScmContribution { @inject(EditorMode) protected readonly editorMode: EditorMode; diff --git a/arduino-ide-extension/src/browser/customization/search-in-workspace/arduino-search-in-workspace-contribution.ts b/arduino-ide-extension/src/browser/customization/search-in-workspace/search-in-workspace-frontend-contribution.ts similarity index 60% rename from arduino-ide-extension/src/browser/customization/search-in-workspace/arduino-search-in-workspace-contribution.ts rename to arduino-ide-extension/src/browser/customization/search-in-workspace/search-in-workspace-frontend-contribution.ts index 0e5a6c2c..c26aa07d 100644 --- a/arduino-ide-extension/src/browser/customization/search-in-workspace/arduino-search-in-workspace-contribution.ts +++ b/arduino-ide-extension/src/browser/customization/search-in-workspace/search-in-workspace-frontend-contribution.ts @@ -1,10 +1,10 @@ import { inject, injectable } from 'inversify'; import { FrontendApplication } from '@theia/core/lib/browser/frontend-application'; -import { SearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution'; +import { SearchInWorkspaceFrontendContribution as TheiaSearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution'; import { EditorMode } from '../../editor-mode'; @injectable() -export class ArduinoSearchInWorkspaceContribution extends SearchInWorkspaceFrontendContribution { +export class SearchInWorkspaceFrontendContribution extends TheiaSearchInWorkspaceFrontendContribution { @inject(EditorMode) protected readonly editorMode: EditorMode; diff --git a/arduino-ide-extension/src/browser/customization/workspace/arduino-workspace-frontend-contribution.ts b/arduino-ide-extension/src/browser/customization/workspace/workspace-frontend-contribution.ts similarity index 86% rename from arduino-ide-extension/src/browser/customization/workspace/arduino-workspace-frontend-contribution.ts rename to arduino-ide-extension/src/browser/customization/workspace/workspace-frontend-contribution.ts index fdeed647..8f17811e 100644 --- a/arduino-ide-extension/src/browser/customization/workspace/arduino-workspace-frontend-contribution.ts +++ b/arduino-ide-extension/src/browser/customization/workspace/workspace-frontend-contribution.ts @@ -2,10 +2,10 @@ import { injectable } from 'inversify'; import { CommandRegistry } from '@theia/core/lib/common/command'; import { MenuModelRegistry } from '@theia/core/lib/common/menu'; import { WorkspaceCommands, FileMenuContribution } from '@theia/workspace/lib/browser/workspace-commands'; -import { WorkspaceFrontendContribution } from '@theia/workspace/lib/browser/workspace-frontend-contribution'; +import { WorkspaceFrontendContribution as TheiaWorkspaceFrontendContribution } from '@theia/workspace/lib/browser/workspace-frontend-contribution'; @injectable() -export class ArduinoWorkspaceFrontendContribution extends WorkspaceFrontendContribution { +export class WorkspaceFrontendContribution extends TheiaWorkspaceFrontendContribution { registerCommands(registry: CommandRegistry): void { super.registerCommands(registry); diff --git a/arduino-ide-extension/src/browser/customization/workspace/arduino-workspace-service.ts b/arduino-ide-extension/src/browser/customization/workspace/workspace-service.ts similarity index 94% rename from arduino-ide-extension/src/browser/customization/workspace/arduino-workspace-service.ts rename to arduino-ide-extension/src/browser/customization/workspace/workspace-service.ts index 60223150..12c375d0 100644 --- a/arduino-ide-extension/src/browser/customization/workspace/arduino-workspace-service.ts +++ b/arduino-ide-extension/src/browser/customization/workspace/workspace-service.ts @@ -1,14 +1,14 @@ import { injectable, inject } from 'inversify'; import { MessageService } from '@theia/core'; import { LabelProvider } from '@theia/core/lib/browser'; -import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service'; +import { WorkspaceService as TheiaWorkspaceService } from '@theia/workspace/lib/browser/workspace-service'; import { ConfigService } from '../../../common/protocol/config-service'; import { SketchesService } from '../../../common/protocol/sketches-service'; import { ArduinoWorkspaceRootResolver } from '../../arduino-workspace-resolver'; import { EditorMode } from '../../editor-mode'; @injectable() -export class ArduinoWorkspaceService extends WorkspaceService { +export class WorkspaceService extends TheiaWorkspaceService { @inject(SketchesService) protected readonly sketchService: SketchesService; diff --git a/arduino-ide-extension/src/browser/library/library-list-widget.ts b/arduino-ide-extension/src/browser/library/library-list-widget.ts index 6e90ac75..bb7f03c8 100644 --- a/arduino-ide-extension/src/browser/library/library-list-widget.ts +++ b/arduino-ide-extension/src/browser/library/library-list-widget.ts @@ -1,7 +1,7 @@ import { inject, injectable } from 'inversify'; import { Library, LibraryService } from '../../common/protocol/library-service'; -import { ListWidget } from '../components/component-list/list-widget'; -import { ListItemRenderer } from '../components/component-list/list-item-renderer'; +import { ListWidget } from '../widgets/component-list/list-widget'; +import { ListItemRenderer } from '../widgets/component-list/list-item-renderer'; @injectable() export class LibraryListWidget extends ListWidget { diff --git a/arduino-ide-extension/src/browser/monitor/monitor-widget.tsx b/arduino-ide-extension/src/browser/monitor/monitor-widget.tsx index 2fb0916f..1e618e46 100644 --- a/arduino-ide-extension/src/browser/monitor/monitor-widget.tsx +++ b/arduino-ide-extension/src/browser/monitor/monitor-widget.tsx @@ -9,7 +9,7 @@ import { DisposableCollection } from '@theia/core/lib/common/disposable' import { ReactWidget, Message, Widget, MessageLoop } from '@theia/core/lib/browser/widgets'; import { Board, Port } from '../../common/protocol/boards-service'; import { MonitorConfig } from '../../common/protocol/monitor-service'; -import { ArduinoSelect } from '../components/arduino-select'; +import { ArduinoSelect } from '../widgets/arduino-select'; import { MonitorModel } from './monitor-model'; import { MonitorConnection } from './monitor-connection'; import { MonitorServiceClientImpl } from './monitor-service-client-impl'; diff --git a/arduino-ide-extension/src/browser/components/arduino-select.tsx b/arduino-ide-extension/src/browser/widgets/arduino-select.tsx similarity index 100% rename from arduino-ide-extension/src/browser/components/arduino-select.tsx rename to arduino-ide-extension/src/browser/widgets/arduino-select.tsx diff --git a/arduino-ide-extension/src/browser/components/component-list/component-list-item.tsx b/arduino-ide-extension/src/browser/widgets/component-list/component-list-item.tsx similarity index 100% rename from arduino-ide-extension/src/browser/components/component-list/component-list-item.tsx rename to arduino-ide-extension/src/browser/widgets/component-list/component-list-item.tsx diff --git a/arduino-ide-extension/src/browser/components/component-list/component-list.tsx b/arduino-ide-extension/src/browser/widgets/component-list/component-list.tsx similarity index 100% rename from arduino-ide-extension/src/browser/components/component-list/component-list.tsx rename to arduino-ide-extension/src/browser/widgets/component-list/component-list.tsx diff --git a/arduino-ide-extension/src/browser/components/component-list/filterable-list-container.tsx b/arduino-ide-extension/src/browser/widgets/component-list/filterable-list-container.tsx similarity index 100% rename from arduino-ide-extension/src/browser/components/component-list/filterable-list-container.tsx rename to arduino-ide-extension/src/browser/widgets/component-list/filterable-list-container.tsx diff --git a/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx b/arduino-ide-extension/src/browser/widgets/component-list/list-item-renderer.tsx similarity index 100% rename from arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx rename to arduino-ide-extension/src/browser/widgets/component-list/list-item-renderer.tsx diff --git a/arduino-ide-extension/src/browser/components/component-list/list-widget-frontend-contribution.ts b/arduino-ide-extension/src/browser/widgets/component-list/list-widget-frontend-contribution.ts similarity index 100% rename from arduino-ide-extension/src/browser/components/component-list/list-widget-frontend-contribution.ts rename to arduino-ide-extension/src/browser/widgets/component-list/list-widget-frontend-contribution.ts diff --git a/arduino-ide-extension/src/browser/components/component-list/list-widget.tsx b/arduino-ide-extension/src/browser/widgets/component-list/list-widget.tsx similarity index 100% rename from arduino-ide-extension/src/browser/components/component-list/list-widget.tsx rename to arduino-ide-extension/src/browser/widgets/component-list/list-widget.tsx diff --git a/arduino-ide-extension/src/browser/components/component-list/search-bar.tsx b/arduino-ide-extension/src/browser/widgets/component-list/search-bar.tsx similarity index 100% rename from arduino-ide-extension/src/browser/components/component-list/search-bar.tsx rename to arduino-ide-extension/src/browser/widgets/component-list/search-bar.tsx diff --git a/arduino-ide-extension/src/browser/components/progress-dialog.tsx b/arduino-ide-extension/src/browser/widgets/progress-dialog.tsx similarity index 100% rename from arduino-ide-extension/src/browser/components/progress-dialog.tsx rename to arduino-ide-extension/src/browser/widgets/progress-dialog.tsx